minor #16145 [FrameworkBundle] Fix deps=low/high tests (nicolas-grekas)

fabpot · fabpot · commit 2539af63ad77 · 2015-10-06T16:42:38.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [FrameworkBundle] Fix deps=low/high tests | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 26ca3dc [FrameworkBundle] Fix deps=low/high tests
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -543,29 +543,29 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
         if (class_exists('Symfony\Component\Validator\Validator')) {
             $r = new \ReflectionClass('Symfony\Component\Validator\Validator');
 
-            $dirs[] = dirname($r->getFilename()).'/Resources/translations';
+            $dirs[] = dirname($r->getFileName()).'/Resources/translations';
         }
         if (class_exists('Symfony\Component\Form\Form')) {
             $r = new \ReflectionClass('Symfony\Component\Form\Form');
 
-            $dirs[] = dirname($r->getFilename()).'/Resources/translations';
+            $dirs[] = dirname($r->getFileName()).'/Resources/translations';
         }
         if (class_exists('Symfony\Component\Security\Core\Exception\AuthenticationException')) {
             $r = new \ReflectionClass('Symfony\Component\Security\Core\Exception\AuthenticationException');
 
-            if (file_exists(dirname($r->getFilename()).'/../composer.json')) {
+            if (file_exists(dirname($r->getFileName()).'/../composer.json')) {
                 // with Symfony 2.4, the Security component was split into several subpackages
                 // and the translations have been moved to the symfony/security-core package
-                $dirs[] = dirname($r->getFilename()).'/../Resources/translations';
+                $dirs[] = dirname($r->getFileName()).'/../Resources/translations';
             } else {
                 // in Symfony 2.3, translations are located in the symfony/security package
-                $dirs[] = dirname($r->getFilename()).'/../../Resources/translations';
+                $dirs[] = dirname($r->getFileName()).'/../../Resources/translations';
             }
         }
         $overridePath = $container->getParameter('kernel.root_dir').'/Resources/%s/translations';
         foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {
             $reflection = new \ReflectionClass($class);
-            if (is_dir($dir = dirname($reflection->getFilename()).'/Resources/translations')) {
+            if (is_dir($dir = dirname($reflection->getFileName()).'/Resources/translations')) {
                 $dirs[] = $dir;
             }
             if (is_dir($dir = sprintf($overridePath, $bundle))) {
@@ -645,7 +645,7 @@ private function getValidatorXmlMappingFiles(ContainerBuilder $container)
 
         foreach ($container->getParameter('kernel.bundles') as $bundle) {
             $reflection = new \ReflectionClass($bundle);
-            if (is_file($file = dirname($reflection->getFilename()).'/Resources/config/validation.xml')) {
+            if (is_file($file = dirname($reflection->getFileName()).'/Resources/config/validation.xml')) {
                 $files[] = realpath($file);
                 $container->addResource(new FileResource($file));
             }
@@ -660,7 +660,7 @@ private function getValidatorYamlMappingFiles(ContainerBuilder $container)
 
         foreach ($container->getParameter('kernel.bundles') as $bundle) {
             $reflection = new \ReflectionClass($bundle);
-            if (is_file($file = dirname($reflection->getFilename()).'/Resources/config/validation.yml')) {
+            if (is_file($file = dirname($reflection->getFileName()).'/Resources/config/validation.yml')) {
                 $files[] = realpath($file);
                 $container->addResource(new FileResource($file));
             }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -196,8 +196,12 @@ public function testTranslator()
             '->registerTranslatorConfiguration() finds Form translation resources'
         );
         $ref = new \ReflectionClass('Symfony\Component\Security\Core\SecurityContext');
+        $ref = dirname($ref->getFileName());
+        if (!file_exists($ref.'/composer.json')) {
+            $ref = dirname($ref);
+        }
         $this->assertContains(
-            strtr(dirname(dirname($ref->getFileName())).'/Resources/translations/security.en.xlf', '/', DIRECTORY_SEPARATOR),
+            strtr($ref.'/Resources/translations/security.en.xlf', '/', DIRECTORY_SEPARATOR),
             $files,
             '->registerTranslatorConfiguration() finds Security translation resources'
         );
diff --git a/src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php b/src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php
@@ -89,4 +89,9 @@ public function testGetSetToken()
         $context->setToken($token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface'));
         $this->assertSame($token, $context->getToken());
     }
+
+    public function testTranslationsAreNotInCore()
+    {
+        $this->assertFalse(file_exists(__DIR__.'/../../Core/Resources/translations/'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -89,4 +89,9 @@ public function testGetSetToken()`
`89`	`89`	`$context->setToken($token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface'));`
`90`	`90`	`$this->assertSame($token, $context->getToken());`
`91`	`91`	`}`
	`92`	`+`
	`93`	`+ public function testTranslationsAreNotInCore()`
	`94`	`+ {`
	`95`	`+ $this->assertFalse(file_exists(__DIR__.'/../../Core/Resources/translations/'));`
	`96`	`+ }`
`92`	`97`	`}`