diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 76264b3c0e..de97b1f44c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -543,29 +543,29 @@ class FrameworkExtension extends Extension 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 @@ class FrameworkExtension extends Extension 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 @@ class FrameworkExtension extends Extension 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 index 67d57e9254..33b5fa7f34 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -196,8 +196,12 @@ abstract class FrameworkExtensionTest extends TestCase '->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 index 124ebf9f44..66958892d3 100644 --- a/src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php +++ b/src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php @@ -89,4 +89,9 @@ class SecurityContextTest extends \PHPUnit_Framework_TestCase $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/')); + } }