minor #28762 [FrameworkBundle] Fix 3.4 tests (ogizanagi)

fabpot · fabpot · commit 0df45a23a2be · 2018-10-08T11:00:30.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [FrameworkBundle] Fix 3.4 tests | Q | A | ------------- | --- | Branch? | 3.4  | Bug fix? | no | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes (AppVeyor failure unrelated)  | Fixed tickets | N/A  | License | MIT | Doc PR | N/A Should fix tests on 3.4 branch after #28735 being merged. Also updates the check for consistency with https://github.com/symfony/symfony/pull/27429/files#diff-5e7347edce37c5886ec67b7ba02f3a9cR837 on master. Commits ------- 3b99a0d [FrameworkBundle] Fix 3.4 tests
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -21,7 +21,7 @@
 use Symfony\Component\Form\Form;
 use Symfony\Component\Lock\Lock;
 use Symfony\Component\Lock\Store\SemaphoreStore;
-use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
+use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Translation\Translator;
@@ -824,7 +824,7 @@ private function addPropertyInfoSection(ArrayNodeDefinition $rootNode)
             ->children()
                 ->arrayNode('property_info')
                     ->info('Property info configuration')
-                    ->{!class_exists(FullStack::class) && class_exists(PropertyInfoExtractor::class) ? 'canBeDisabled' : 'canBeEnabled'}()
+                    ->{!class_exists(FullStack::class) && interface_exists(PropertyInfoExtractorInterface::class) ? 'canBeDisabled' : 'canBeEnabled'}()
                 ->end()
             ->end()
         ;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -335,7 +335,7 @@ protected static function getBundleDefaultConfig()
                 'throw_exception_on_invalid_index' => false,
             ),
             'property_info' => array(
-                'enabled' => false,
+                'enabled' => !class_exists(FullStack::class),
             ),
             'router' => array(
                 'enabled' => false,
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -979,12 +979,6 @@ public function testSerializerServiceIsNotRegisteredWhenDisabled()
         $this->assertFalse($container->hasDefinition('serializer'));
     }
 
-    public function testPropertyInfoDisabled()
-    {
-        $container = $this->createContainerFromFile('default_config');
-        $this->assertFalse($container->has('property_info'));
-    }
-
     public function testPropertyInfoEnabled()
     {
         $container = $this->createContainerFromFile('property_info');

Original file line number	Diff line number	Diff line change
`@@ -979,12 +979,6 @@ public function testSerializerServiceIsNotRegisteredWhenDisabled()`
`979`	`979`	`$this->assertFalse($container->hasDefinition('serializer'));`
`980`	`980`	`}`
`981`	`981`
`982`		`- public function testPropertyInfoDisabled()`
`983`		`- {`
`984`		`- $container = $this->createContainerFromFile('default_config');`
`985`		`- $this->assertFalse($container->has('property_info'));`
`986`		`- }`
`987`		`-`
`988`	`982`	`public function testPropertyInfoEnabled()`
`989`	`983`	`{`
`990`	`984`	`$container = $this->createContainerFromFile('property_info');`