feature #18416 [FrameworkBundle] Calls support for debug:container (JhonnyL)

fabpot · fabpot · commit d4799348ff1b · 2016-04-14T13:58:12.000+02:00
This PR was merged into the 3.1-dev branch. Discussion ---------- [FrameworkBundle] Calls support for debug:container | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | no | Fixed tickets | | License | MIT | Doc PR | * Show methods to be called after service initialization in `debug:container` command Commits ------- b2d1038 [FrameworkBundle] Calls support for debug:container
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -242,6 +242,14 @@ private function getContainerDefinitionData(Definition $definition, $omitTags =
             }
         }
 
+        $calls = $definition->getMethodCalls();
+        if (count($calls) > 0) {
+            $data['calls'] = array();
+            foreach ($calls as $callData) {
+                $data['calls'][] = $callData[0];
+            }
+        }
+
         if (!$omitTags) {
             $data['tags'] = array();
             if (count($definition->getTags())) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
@@ -214,6 +214,11 @@ protected function describeContainerDefinition(Definition $definition, array $op
             }
         }
 
+        $calls = $definition->getMethodCalls();
+        foreach ($calls as $callData) {
+            $output .= "\n".'- Call: `'.$callData[0].'`';
+        }
+
         if (!(isset($options['omit_tags']) && $options['omit_tags'])) {
             foreach ($definition->getTags() as $tagName => $tagData) {
                 foreach ($tagData as $parameters) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -275,6 +275,15 @@ protected function describeContainerDefinition(Definition $definition, array $op
         }
         $tableRows[] = array('Tags', $tagInformation);
 
+        $calls = $definition->getMethodCalls();
+        if (count($calls) > 0) {
+            $callInformation = [];
+            foreach ($calls as $call) {
+                $callInformation[] = $call[0];
+            }
+            $tableRows[] = array('Calls', implode(', ', $callInformation));
+        }
+
         $tableRows[] = array('Public', $definition->isPublic() ? 'yes' : 'no');
         $tableRows[] = array('Synthetic', $definition->isSynthetic() ? 'yes' : 'no');
         $tableRows[] = array('Lazy', $definition->isLazy() ? 'yes' : 'no');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -360,6 +360,15 @@ private function getContainerDefinitionDocument(Definition $definition, $id = nu
 
         $serviceXML->setAttribute('file', $definition->getFile());
 
+        $calls = $definition->getMethodCalls();
+        if (count($calls) > 0) {
+            $serviceXML->appendChild($callsXML = $dom->createElement('calls'));
+            foreach ($calls as $callData) {
+                $callsXML->appendChild($callXML = $dom->createElement('call'));
+                $callXML->setAttribute('method', $callData[0]);
+            }
+        }
+
         if (!$omitTags) {
             $tags = $definition->getTags();
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
@@ -115,6 +115,7 @@ public static function getContainerDefinitions()
                 ->addTag('tag1', array('attr1' => 'val1', 'attr2' => 'val2'))
                 ->addTag('tag1', array('attr3' => 'val3'))
                 ->addTag('tag2')
+                ->addMethodCall('setMailer', array(new Reference('mailer')))
                 ->setFactory(array(new Reference('factory.service'), 'get')),
         );
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json
@@ -47,6 +47,9 @@
                     ]
                 }
             ],
+            "calls": [
+                "setMailer"
+            ],
             "autowire": false,
             "autowiring_types": []
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md
@@ -30,6 +30,7 @@ definition_2
 - File: `/path/to/file`
 - Factory Service: `factory.service`
 - Factory Method: `get`
+- Call: `setMailer`
 - Tag: `tag1`
     - Attr1: val1
     - Attr2: val2
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml
@@ -7,6 +7,9 @@
   </definition>
   <definition id="definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" file="/path/to/file">
     <factory service="factory.service" method="get"/>
+    <calls>
+      <call method="setMailer"/>
+    </calls>
     <tags>
       <tag name="tag1">
         <parameter name="attr1">val1</parameter>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json
@@ -31,6 +31,9 @@
                     ]
                 }
             ],
+            "calls": [
+                "setMailer"
+            ],
             "autowire": false,
             "autowiring_types": []
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md
@@ -17,6 +17,7 @@ definition_2
 - File: `/path/to/file`
 - Factory Service: `factory.service`
 - Factory Method: `get`
+- Call: `setMailer`
 - Tag: `tag1`
     - Attr1: val1
     - Attr2: val2
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml
@@ -2,6 +2,9 @@
 <container>
   <definition id="definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" file="/path/to/file">
     <factory service="factory.service" method="get"/>
+    <calls>
+      <call method="setMailer"/>
+    </calls>
     <tags>
       <tag name="tag1">
         <parameter name="attr1">val1</parameter>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json
@@ -8,6 +8,9 @@
             "shared": true,
             "abstract": false,
             "file": "\/path\/to\/file",
+            "calls": [
+                "setMailer"
+            ],
             "factory_service": "factory.service",
             "factory_method": "get",
             "autowire": false,
@@ -23,6 +26,9 @@
             "shared": true,
             "abstract": false,
             "file": "\/path\/to\/file",
+            "calls": [
+                "setMailer"
+            ],
             "factory_service": "factory.service",
             "factory_method": "get",
             "autowire": false,
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md
@@ -17,6 +17,7 @@ definition_2
 - File: `/path/to/file`
 - Factory Service: `factory.service`
 - Factory Method: `get`
+- Call: `setMailer`
 
 
 tag2
@@ -35,3 +36,4 @@ definition_2
 - File: `/path/to/file`
 - Factory Service: `factory.service`
 - Factory Method: `get`
+- Call: `setMailer`
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.xml
@@ -3,11 +3,17 @@
   <tag name="tag1">
     <definition id="definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" file="/path/to/file">
       <factory service="factory.service" method="get"/>
+      <calls>
+        <call method="setMailer"/>
+      </calls>
     </definition>
   </tag>
   <tag name="tag2">
     <definition id="definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" file="/path/to/file">
       <factory service="factory.service" method="get"/>
+      <calls>
+        <call method="setMailer"/>
+      </calls>
     </definition>
   </tag>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json
@@ -29,6 +29,9 @@
             ]
         }
     ],
+    "calls": [
+        "setMailer"
+    ],
     "autowire": false,
     "autowiring_types": []
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.md
@@ -8,9 +8,10 @@
 - File: `/path/to/file`
 - Factory Service: `factory.service`
 - Factory Method: `get`
+- Call: `setMailer`
 - Tag: `tag1`
     - Attr1: val1
     - Attr2: val2
 - Tag: `tag1`
     - Attr3: val3
-- Tag: `tag2`
+- Tag: `tag2`
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt
@@ -4,6 +4,7 @@
   Service ID         -                                                      
   Class              Full\Qualified\Class2                                  
   Tags               tag1 ([32mattr1[39m: val1, [32mattr2[39m: val2)tag1 ([32mattr3[39m: val3)tag2  
+  Calls              setMailer                                              
   Public             no                                                     
   Synthetic          yes                                                    
   Lazy               no                                                     
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definition class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" file="/path/to/file">
   <factory service="factory.service" method="get"/>
+  <calls>
+    <call method="setMailer"/>
+  </calls>
   <tags>
     <tag name="tag1">
       <parameter name="attr1">val1</parameter>

Original file line number	Diff line number	Diff line change
`@@ -242,6 +242,14 @@ private function getContainerDefinitionData(Definition $definition, $omitTags =`
`242`	`242`	`}`
`243`	`243`	`}`
`244`	`244`
	`245`	`+ $calls = $definition->getMethodCalls();`
	`246`	`+ if (count($calls) > 0) {`
	`247`	`+ $data['calls'] = array();`
	`248`	`+ foreach ($calls as $callData) {`
	`249`	`+ $data['calls'][] = $callData[0];`
	`250`	`+ }`
	`251`	`+ }`
	`252`	`+`
`245`	`253`	`if (!$omitTags) {`
`246`	`254`	`$data['tags'] = array();`
`247`	`255`	`if (count($definition->getTags())) {`
Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,11 @@ protected function describeContainerDefinition(Definition $definition, array $op`
`214`	`214`	`}`
`215`	`215`	`}`
`216`	`216`
	`217`	`+ $calls = $definition->getMethodCalls();`
	`218`	`+ foreach ($calls as $callData) {`
	`219`	+ $output .= "\n".'- Call: `'.$callData[0].'`';
	`220`	`+ }`
	`221`	`+`
`217`	`222`	`if (!(isset($options['omit_tags']) && $options['omit_tags'])) {`
`218`	`223`	`foreach ($definition->getTags() as $tagName => $tagData) {`
`219`	`224`	`foreach ($tagData as $parameters) {`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ public static function getContainerDefinitions()`
`115`	`115`	`->addTag('tag1', array('attr1' => 'val1', 'attr2' => 'val2'))`
`116`	`116`	`->addTag('tag1', array('attr3' => 'val3'))`
`117`	`117`	`->addTag('tag2')`
	`118`	`+ ->addMethodCall('setMailer', array(new Reference('mailer')))`
`118`	`119`	`->setFactory(array(new Reference('factory.service'), 'get')),`
`119`	`120`	`);`
`120`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,9 @@`
`47`	`47`	`]`
`48`	`48`	`}`
`49`	`49`	`],`
	`50`	`+ "calls": [`
	`51`	`+ "setMailer"`
	`52`	`+ ],`
`50`	`53`	`"autowire": false,`
`51`	`54`	`"autowiring_types": []`
`52`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,9 @@`
`31`	`31`	`]`
`32`	`32`	`}`
`33`	`33`	`],`
	`34`	`+ "calls": [`
	`35`	`+ "setMailer"`
	`36`	`+ ],`
`34`	`37`	`"autowire": false,`
`35`	`38`	`"autowiring_types": []`
`36`	`39`	`}`