Merge branch '6.1' into 6.2

xabbuh · xabbuh · commit 424440acda42 · 2022-09-03T16:53:03.000+02:00
* 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
diff --git a/Console/Descriptor/JsonDescriptor.php b/Console/Descriptor/JsonDescriptor.php
@@ -252,7 +252,7 @@ private function getContainerDefinitionData(Definition $definition, bool $omitTa
                 if ($factory[0] instanceof Reference) {
                     $data['factory_service'] = (string) $factory[0];
                 } elseif ($factory[0] instanceof Definition) {
-                    $data['factory_class'] = $factory[0]->getClass() ?? 'not configured';
+                    $data['factory_service'] = sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured');
                 } else {
                     $data['factory_class'] = $factory[0];
                 }
diff --git a/Console/Descriptor/MarkdownDescriptor.php b/Console/Descriptor/MarkdownDescriptor.php
@@ -231,7 +231,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
                 if ($factory[0] instanceof Reference) {
                     $output .= "\n".'- Factory Service: `'.$factory[0].'`';
                 } elseif ($factory[0] instanceof Definition) {
-                    $output .= "\n".'- Factory Class: `'.($factory[0]->getClass() ?? 'not configured').'`';
+                    $output .= "\n".sprintf('- Factory Service: inline factory service (%s)', $factory[0]->getClass() ? sprintf('`%s`', $factory[0]->getClass()) : 'not configured');
                 } else {
                     $output .= "\n".'- Factory Class: `'.$factory[0].'`';
                 }
diff --git a/Console/Descriptor/TextDescriptor.php b/Console/Descriptor/TextDescriptor.php
@@ -315,7 +315,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
                 if ($factory[0] instanceof Reference) {
                     $tableRows[] = ['Factory Service', $factory[0]];
                 } elseif ($factory[0] instanceof Definition) {
-                    $tableRows[] = ['Factory Class', $factory[0]->getClass() ?? 'not configured'];
+                    $tableRows[] = ['Factory Service', sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured')];
                 } else {
                     $tableRows[] = ['Factory Class', $factory[0]];
                 }
diff --git a/Console/Descriptor/XmlDescriptor.php b/Console/Descriptor/XmlDescriptor.php
@@ -324,7 +324,7 @@ private function getContainerDefinitionDocument(Definition $definition, string $
                 if ($factory[0] instanceof Reference) {
                     $factoryXML->setAttribute('service', (string) $factory[0]);
                 } elseif ($factory[0] instanceof Definition) {
-                    $factoryXML->setAttribute('class', $factory[0]->getClass() ?? 'not configured');
+                    $factoryXML->setAttribute('service', sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'not configured'));
                 } else {
                     $factoryXML->setAttribute('class', $factory[0]);
                 }
diff --git a/Tests/Fixtures/Descriptor/builder_1_services.json b/Tests/Fixtures/Descriptor/builder_1_services.json
@@ -48,7 +48,7 @@
             "autoconfigure": false,
             "deprecated": false,
             "file": "\/path\/to\/file",
-            "factory_class": "Full\\Qualified\\FactoryClass",
+            "factory_service": "inline factory service (Full\\Qualified\\FactoryClass)",
             "factory_method": "get",
             "tags": [],
             "usages": []
diff --git a/Tests/Fixtures/Descriptor/builder_1_services.md b/Tests/Fixtures/Descriptor/builder_1_services.md
@@ -39,7 +39,7 @@ Definitions
 - Autoconfigured: no
 - Deprecated: no
 - File: `/path/to/file`
-- Factory Class: `Full\Qualified\FactoryClass`
+- Factory Service: inline factory service (`Full\Qualified\FactoryClass`)
 - Factory Method: `get`
 - Usages: none
 
diff --git a/Tests/Fixtures/Descriptor/builder_1_services.xml b/Tests/Fixtures/Descriptor/builder_1_services.xml
@@ -18,6 +18,6 @@
     </tags>
   </definition>
   <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">
-    <factory class="Full\Qualified\FactoryClass" method="get"/>
+    <factory service="inline factory service (Full\Qualified\FactoryClass)" method="get"/>
   </definition>
 </container>
diff --git a/Tests/Fixtures/Descriptor/definition_3.json b/Tests/Fixtures/Descriptor/definition_3.json
@@ -9,7 +9,7 @@
     "autoconfigure": false,
     "deprecated": false,
     "file": "\/path\/to\/file",
-    "factory_class": "Full\\Qualified\\FactoryClass",
+    "factory_service": "inline factory service (Full\\Qualified\\FactoryClass)",
     "factory_method": "get",
     "tags": [],
     "usages": []
diff --git a/Tests/Fixtures/Descriptor/definition_3.md b/Tests/Fixtures/Descriptor/definition_3.md
@@ -8,6 +8,6 @@
 - Autoconfigured: no
 - Deprecated: no
 - File: `/path/to/file`
-- Factory Class: `Full\Qualified\FactoryClass`
+- Factory Service: inline factory service (`Full\Qualified\FactoryClass`)
 - Factory Method: `get`
 - Usages: none
diff --git a/Tests/Fixtures/Descriptor/definition_3.txt b/Tests/Fixtures/Descriptor/definition_3.txt
@@ -1,19 +1,19 @@
- ---------------- ----------------------------- 
- [32m Option         [39m [32m Value                       [39m 
- ---------------- ----------------------------- 
-  Service ID       -                            
-  Class            Full\Qualified\Class3        
-  Tags             -                            
-  Public           no                           
-  Synthetic        no                           
-  Lazy             no                           
-  Shared           yes                          
-  Abstract         no                           
-  Autowired        no                           
-  Autoconfigured   no                           
-  Required File    /path/to/file                
-  Factory Class    Full\Qualified\FactoryClass  
-  Factory Method   get                          
-  Usages           none                         
- ---------------- ----------------------------- 
+ ----------------- ------------------------------------------------------ 
+ [32m Option          [39m [32m Value                                                [39m 
+ ----------------- ------------------------------------------------------ 
+  Service ID        -                                                     
+  Class             Full\Qualified\Class3                                 
+  Tags              -                                                     
+  Public            no                                                    
+  Synthetic         no                                                    
+  Lazy              no                                                    
+  Shared            yes                                                   
+  Abstract          no                                                    
+  Autowired         no                                                    
+  Autoconfigured    no                                                    
+  Required File     /path/to/file                                         
+  Factory Service   inline factory service (Full\Qualified\FactoryClass)  
+  Factory Method    get                                                   
+  Usages            none                                                  
+ ----------------- ------------------------------------------------------ 
 
diff --git a/Tests/Fixtures/Descriptor/definition_3.xml b/Tests/Fixtures/Descriptor/definition_3.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-  <factory class="Full\Qualified\FactoryClass" method="get"/>
+  <factory service="inline factory service (Full\Qualified\FactoryClass)" method="get"/>
 </definition>
diff --git a/Tests/Fixtures/Descriptor/definition_arguments_3.json b/Tests/Fixtures/Descriptor/definition_arguments_3.json
@@ -10,7 +10,7 @@
     "deprecated": false,
     "arguments": [],
     "file": "\/path\/to\/file",
-    "factory_class": "Full\\Qualified\\FactoryClass",
+    "factory_service": "inline factory service (Full\\Qualified\\FactoryClass)",
     "factory_method": "get",
     "tags": [],
     "usages": []
diff --git a/Tests/Fixtures/Descriptor/definition_arguments_3.md b/Tests/Fixtures/Descriptor/definition_arguments_3.md
@@ -9,6 +9,6 @@
 - Deprecated: no
 - Arguments: no
 - File: `/path/to/file`
-- Factory Class: `Full\Qualified\FactoryClass`
+- Factory Service: inline factory service (`Full\Qualified\FactoryClass`)
 - Factory Method: `get`
 - Usages: none
diff --git a/Tests/Fixtures/Descriptor/definition_arguments_3.txt b/Tests/Fixtures/Descriptor/definition_arguments_3.txt
@@ -1,19 +1,19 @@
- ---------------- ----------------------------- 
- [32m Option         [39m [32m Value                       [39m 
- ---------------- ----------------------------- 
-  Service ID       -                            
-  Class            Full\Qualified\Class3        
-  Tags             -                            
-  Public           no                           
-  Synthetic        no                           
-  Lazy             no                           
-  Shared           yes                          
-  Abstract         no                           
-  Autowired        no                           
-  Autoconfigured   no                           
-  Required File    /path/to/file                
-  Factory Class    Full\Qualified\FactoryClass  
-  Factory Method   get                          
-  Usages           none                         
- ---------------- -----------------------------
+ ----------------- ------------------------------------------------------ 
+ [32m Option          [39m [32m Value                                                [39m 
+ ----------------- ------------------------------------------------------ 
+  Service ID        -                                                     
+  Class             Full\Qualified\Class3                                 
+  Tags              -                                                     
+  Public            no                                                    
+  Synthetic         no                                                    
+  Lazy              no                                                    
+  Shared            yes                                                   
+  Abstract          no                                                    
+  Autowired         no                                                    
+  Autoconfigured    no                                                    
+  Required File     /path/to/file                                         
+  Factory Service   inline factory service (Full\Qualified\FactoryClass)  
+  Factory Method    get                                                   
+  Usages            none                                                  
+ ----------------- ------------------------------------------------------
 
diff --git a/Tests/Fixtures/Descriptor/definition_arguments_3.xml b/Tests/Fixtures/Descriptor/definition_arguments_3.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-  <factory class="Full\Qualified\FactoryClass" method="get"/>
+  <factory service="inline factory service (Full\Qualified\FactoryClass)" method="get"/>
 </definition>

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ private function getContainerDefinitionData(Definition $definition, bool $omitTa`
`252`	`252`	`if ($factory[0] instanceof Reference) {`
`253`	`253`	`$data['factory_service'] = (string) $factory[0];`
`254`	`254`	`} 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');`
`256`	`256`	`} else {`
`257`	`257`	`$data['factory_class'] = $factory[0];`
`258`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ protected function describeContainerDefinition(Definition $definition, array $op`
`231`	`231`	`if ($factory[0] instanceof Reference) {`
`232`	`232`	$output .= "\n".'- Factory Service: `'.$factory[0].'`';
`233`	`233`	`} 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');
`235`	`235`	`} else {`
`236`	`236`	$output .= "\n".'- Factory Class: `'.$factory[0].'`';
`237`	`237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ protected function describeContainerDefinition(Definition $definition, array $op`
`315`	`315`	`if ($factory[0] instanceof Reference) {`
`316`	`316`	`$tableRows[] = ['Factory Service', $factory[0]];`
`317`	`317`	`} 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')];`
`319`	`319`	`} else {`
`320`	`320`	`$tableRows[] = ['Factory Class', $factory[0]];`
`321`	`321`	`}`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ private function getContainerDefinitionDocument(Definition $definition, string $`
`324`	`324`	`if ($factory[0] instanceof Reference) {`
`325`	`325`	`$factoryXML->setAttribute('service', (string) $factory[0]);`
`326`	`326`	`} 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'));`
`328`	`328`	`} else {`
`329`	`329`	`$factoryXML->setAttribute('class', $factory[0]);`
`330`	`330`	`}`