Merge branch '3.4'

nicolas-grekas · nicolas-grekas · commit a9c55bdb41e4 · 2017-05-21T11:24:30.000+02:00
* 3.4:
  [FrameworkBundle] add forward compatibility layer when using FrameworkBundle in version 3.4 with DependencyInjection component in version 4.0
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -231,8 +231,11 @@ private function getContainerDefinitionData(Definition $definition, $omitTags =
             'autoconfigure' => $definition->isAutoconfigured(),
         );
 
-        foreach ($definition->getAutowiringTypes(false) as $autowiringType) {
-            $data['autowiring_types'][] = $autowiringType;
+        // forward compatibility with DependencyInjection component in version 4.0
+        if (method_exists($definition, 'getAutowiringTypes')) {
+            foreach ($definition->getAutowiringTypes(false) as $autowiringType) {
+                $data['autowiring_types'][] = $autowiringType;
+            }
         }
 
         if ($showArguments) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
@@ -191,8 +191,11 @@ protected function describeContainerDefinition(Definition $definition, array $op
             ."\n".'- Autoconfigured: '.($definition->isAutoconfigured() ? 'yes' : 'no')
         ;
 
-        foreach ($definition->getAutowiringTypes(false) as $autowiringType) {
-            $output .= "\n".'- Autowiring Type: `'.$autowiringType.'`';
+        // forward compatibility with DependencyInjection component in version 4.0
+        if (method_exists($definition, 'getAutowiringTypes')) {
+            foreach ($definition->getAutowiringTypes(false) as $autowiringType) {
+                $output .= "\n".'- Autowiring Type: `'.$autowiringType.'`';
+            }
         }
 
         if (isset($options['show_arguments']) && $options['show_arguments']) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -309,7 +309,8 @@ protected function describeContainerDefinition(Definition $definition, array $op
         $tableRows[] = array('Autowired', $definition->isAutowired() ? 'yes' : 'no');
         $tableRows[] = array('Autoconfigured', $definition->isAutoconfigured() ? 'yes' : 'no');
 
-        if ($autowiringTypes = $definition->getAutowiringTypes(false)) {
+        // forward compatibility with DependencyInjection component in version 4.0
+        if (method_exists($definition, 'getAutowiringTypes') && $autowiringTypes = $definition->getAutowiringTypes(false)) {
             $tableRows[] = array('Autowiring Types', implode(', ', $autowiringTypes));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -191,8 +191,11 @@ protected function describeContainerDefinition(Definition $definition, array $op`
`191`	`191`	`."\n".'- Autoconfigured: '.($definition->isAutoconfigured() ? 'yes' : 'no')`
`192`	`192`	`;`
`193`	`193`
`194`		`- foreach ($definition->getAutowiringTypes(false) as $autowiringType) {`
`195`		- $output .= "\n".'- Autowiring Type: `'.$autowiringType.'`';
	`194`	`+ // forward compatibility with DependencyInjection component in version 4.0`
	`195`	`+ if (method_exists($definition, 'getAutowiringTypes')) {`
	`196`	`+ foreach ($definition->getAutowiringTypes(false) as $autowiringType) {`
	`197`	+ $output .= "\n".'- Autowiring Type: `'.$autowiringType.'`';
	`198`	`+ }`
`196`	`199`	`}`
`197`	`200`
`198`	`201`	`if (isset($options['show_arguments']) && $options['show_arguments']) {`
Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,8 @@ protected function describeContainerDefinition(Definition $definition, array $op`
`309`	`309`	`$tableRows[] = array('Autowired', $definition->isAutowired() ? 'yes' : 'no');`
`310`	`310`	`$tableRows[] = array('Autoconfigured', $definition->isAutoconfigured() ? 'yes' : 'no');`
`311`	`311`
`312`		`- if ($autowiringTypes = $definition->getAutowiringTypes(false)) {`
	`312`	`+ // forward compatibility with DependencyInjection component in version 4.0`
	`313`	`+ if (method_exists($definition, 'getAutowiringTypes') && $autowiringTypes = $definition->getAutowiringTypes(false)) {`
`313`	`314`	`$tableRows[] = array('Autowiring Types', implode(', ', $autowiringTypes));`
`314`	`315`	`}`
`315`	`316`