Skip to content

Commit 9575ae3

Browse files
xabbuhxabbuh
committed
Merge branch '6.1' into 6.2
* 6.1: tweak the factory class description for inlined factory services skip a transient test on Windows [Console] [Completion] Make fish completion run in non interactive mode Make bash completion run in non interactive mode
2 parents 1198986 + 23e7c4a commit 9575ae3

18 files changed

+55
-51
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ private function getContainerDefinitionData(Definition $definition, bool $omitTa
252252
if ($factory[0] instanceof Reference) {
253253
$data['factory_service'] = (string) $factory[0];
254254
} elseif ($factory[0] instanceof Definition) {
255-
$data['factory_class'] = $factory[0]->getClass() ?? 'not configured';
255+
$data['factory_service'] = sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured');
256256
} else {
257257
$data['factory_class'] = $factory[0];
258258
}

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
231231
if ($factory[0] instanceof Reference) {
232232
$output .= "\n".'- Factory Service: `'.$factory[0].'`';
233233
} elseif ($factory[0] instanceof Definition) {
234-
$output .= "\n".'- Factory Class: `'.($factory[0]->getClass() ?? 'not configured').'`';
234+
$output .= "\n".sprintf('- Factory Service: inline factory service (%s)', $factory[0]->getClass() ? sprintf('`%s`', $factory[0]->getClass()) : 'not configured');
235235
} else {
236236
$output .= "\n".'- Factory Class: `'.$factory[0].'`';
237237
}

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
315315
if ($factory[0] instanceof Reference) {
316316
$tableRows[] = ['Factory Service', $factory[0]];
317317
} elseif ($factory[0] instanceof Definition) {
318-
$tableRows[] = ['Factory Class', $factory[0]->getClass() ?? 'not configured'];
318+
$tableRows[] = ['Factory Service', sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured')];
319319
} else {
320320
$tableRows[] = ['Factory Class', $factory[0]];
321321
}

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ private function getContainerDefinitionDocument(Definition $definition, string $
324324
if ($factory[0] instanceof Reference) {
325325
$factoryXML->setAttribute('service', (string) $factory[0]);
326326
} elseif ($factory[0] instanceof Definition) {
327-
$factoryXML->setAttribute('class', $factory[0]->getClass() ?? 'not configured');
327+
$factoryXML->setAttribute('service', sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'not configured'));
328328
} else {
329329
$factoryXML->setAttribute('class', $factory[0]);
330330
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"autoconfigure": false,
4949
"deprecated": false,
5050
"file": "\/path\/to\/file",
51-
"factory_class": "Full\\Qualified\\FactoryClass",
51+
"factory_service": "inline factory service (Full\\Qualified\\FactoryClass)",
5252
"factory_method": "get",
5353
"tags": [],
5454
"usages": []

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Definitions
3939
- Autoconfigured: no
4040
- Deprecated: no
4141
- File: `/path/to/file`
42-
- Factory Class: `Full\Qualified\FactoryClass`
42+
- Factory Service: inline factory service (`Full\Qualified\FactoryClass`)
4343
- Factory Method: `get`
4444
- Usages: none
4545

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
</tags>
1919
</definition>
2020
<definition id=".definition_3" class="Full\Qualified\Class3" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" deprecated="false" file="/path/to/file">
21-
<factory class="Full\Qualified\FactoryClass" method="get"/>
21+
<factory service="inline factory service (Full\Qualified\FactoryClass)" method="get"/>
2222
</definition>
2323
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_3.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"autoconfigure": false,
1010
"deprecated": false,
1111
"file": "\/path\/to\/file",
12-
"factory_class": "Full\\Qualified\\FactoryClass",
12+
"factory_service": "inline factory service (Full\\Qualified\\FactoryClass)",
1313
"factory_method": "get",
1414
"tags": [],
1515
"usages": []

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
- Autoconfigured: no
99
- Deprecated: no
1010
- File: `/path/to/file`
11-
- Factory Class: `Full\Qualified\FactoryClass`
11+
- Factory Service: inline factory service (`Full\Qualified\FactoryClass`)
1212
- Factory Method: `get`
1313
- Usages: none

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_3.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
---------------- -----------------------------
2-
 Option   Value 
3-
---------------- -----------------------------
4-
Service ID -
5-
Class Full\Qualified\Class3
6-
Tags -
7-
Public no
8-
Synthetic no
9-
Lazy no
10-
Shared yes
11-
Abstract no
12-
Autowired no
13-
Autoconfigured no
14-
Required File /path/to/file
15-
Factory Class Full\Qualified\FactoryClass
16-
Factory Method get
17-
Usages none
18-
---------------- -----------------------------
1+
----------------- ------------------------------------------------------
2+
 Option   Value 
3+
----------------- ------------------------------------------------------
4+
Service ID -
5+
Class Full\Qualified\Class3
6+
Tags -
7+
Public no
8+
Synthetic no
9+
Lazy no
10+
Shared yes
11+
Abstract no
12+
Autowired no
13+
Autoconfigured no
14+
Required File /path/to/file
15+
Factory Service inline factory service (Full\Qualified\FactoryClass)
16+
Factory Method get
17+
Usages none
18+
----------------- ------------------------------------------------------
1919

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_3.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<definition class="Full\Qualified\Class3" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" deprecated="false" file="/path/to/file">
3-
<factory class="Full\Qualified\FactoryClass" method="get"/>
3+
<factory service="inline factory service (Full\Qualified\FactoryClass)" method="get"/>
44
</definition>

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_3.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"deprecated": false,
1111
"arguments": [],
1212
"file": "\/path\/to\/file",
13-
"factory_class": "Full\\Qualified\\FactoryClass",
13+
"factory_service": "inline factory service (Full\\Qualified\\FactoryClass)",
1414
"factory_method": "get",
1515
"tags": [],
1616
"usages": []

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
- Deprecated: no
1010
- Arguments: no
1111
- File: `/path/to/file`
12-
- Factory Class: `Full\Qualified\FactoryClass`
12+
- Factory Service: inline factory service (`Full\Qualified\FactoryClass`)
1313
- Factory Method: `get`
1414
- Usages: none

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_3.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
---------------- -----------------------------
2-
 Option   Value 
3-
---------------- -----------------------------
4-
Service ID -
5-
Class Full\Qualified\Class3
6-
Tags -
7-
Public no
8-
Synthetic no
9-
Lazy no
10-
Shared yes
11-
Abstract no
12-
Autowired no
13-
Autoconfigured no
14-
Required File /path/to/file
15-
Factory Class Full\Qualified\FactoryClass
16-
Factory Method get
17-
Usages none
18-
---------------- -----------------------------
1+
----------------- ------------------------------------------------------
2+
 Option   Value 
3+
----------------- ------------------------------------------------------
4+
Service ID -
5+
Class Full\Qualified\Class3
6+
Tags -
7+
Public no
8+
Synthetic no
9+
Lazy no
10+
Shared yes
11+
Abstract no
12+
Autowired no
13+
Autoconfigured no
14+
Required File /path/to/file
15+
Factory Service inline factory service (Full\Qualified\FactoryClass)
16+
Factory Method get
17+
Usages none
18+
----------------- ------------------------------------------------------
1919

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_3.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<definition class="Full\Qualified\Class3" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" deprecated="false" file="/path/to/file">
3-
<factory class="Full\Qualified\FactoryClass" method="get"/>
3+
<factory service="inline factory service (Full\Qualified\FactoryClass)" method="get"/>
44
</definition>

‎src/Symfony/Component/Console/Resources/completion.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ _sf_{{ COMMAND_NAME }}() {
2424
local cur prev words cword
2525
_get_comp_words_by_ref -n := cur prev words cword
2626

27-
local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-a{{ VERSION }}")
27+
local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-a{{ VERSION }}")
2828
for w in ${words[@]}; do
2929
w=$(printf -- '%b' "$w")
3030
# remove quotes from typed values

‎src/Symfony/Component/Console/Resources/completion.fish

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function _sf_{{ COMMAND_NAME }}
99
set sf_cmd (commandline -o)
1010
set c (count (commandline -oc))
1111

12-
set completecmd "$sf_cmd[1]" "_complete" "-sfish" "-a{{ VERSION }}"
12+
set completecmd "$sf_cmd[1]" "_complete" "--no-interaction" "-sfish" "-a{{ VERSION }}"
1313

1414
for i in $sf_cmd
1515
if [ $i != "" ]

‎src/Symfony/Component/VarDumper/Tests/Server/ConnectionTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ class ConnectionTest extends TestCase
2424

2525
public function testDump()
2626
{
27+
if ('True' === getenv('APPVEYOR')) {
28+
$this->markTestSkipped('Skip transient test on AppVeyor');
29+
}
30+
2731
$cloner = new VarCloner();
2832
$data = $cloner->cloneVar('foo');
2933
$connection = new Connection(self::VAR_DUMPER_SERVER, [

0 commit comments

Comments
 (0)