more

yceruto · yceruto · commit 890ab3f59a82 · 2019-08-01T12:14:01.000-04:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
@@ -162,12 +162,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (null !== $input->getArgument('bundle')) {
             try {
                 $bundle = $kernel->getBundle($input->getArgument('bundle'));
+                $transPaths = [$bundle->getPath().'/Resources/translations'];
+                $viewsPaths = [$bundle->getPath().'/Resources/views'];
                 if (method_exists($bundle, 'getBundleDir')) {
-                    $transPaths = [$bundle->getBundleDir().'/translations'];
-                    $viewsPaths = [$bundle->getBundleDir().'/templates'];
-                } else {
-                    $transPaths = [$bundle->getPath().'/Resources/translations'];
-                    $viewsPaths = [$bundle->getPath().'/Resources/views'];
+                    if (is_dir($bundle->getBundleDir().'/translations')) {
+                        $transPaths = [$bundle->getBundleDir().'/translations'];
+                    }
+                    if (is_dir($bundle->getBundleDir().'/templates')) {
+                        $viewsPaths = [$bundle->getBundleDir().'/templates'];
+                    }
                 }
                 if ($this->defaultTransPath) {
                     $transPaths[] = $this->defaultTransPath;
@@ -211,11 +214,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
         } elseif ($input->getOption('all')) {
             foreach ($kernel->getBundles() as $bundle) {
-                if (method_exists($bundle, 'getBundleDir')) {
+                if (method_exists($bundle, 'getBundleDir') && is_dir($bundle->getBundleDir().'/translations')) {
                     $transPaths[] = $bundle->getBundleDir().'/translations';
-                    $viewsPaths[] = $bundle->getBundleDir().'/templates';
                 } else {
                     $transPaths[] = $bundle->getPath().'/Resources/translations';
+                }
+                if (method_exists($bundle, 'getBundleDir') && is_dir($bundle->getBundleDir().'/templates')) {
+                    $viewsPaths[] = $bundle->getBundleDir().'/templates';
+                } else {
                     $viewsPaths[] = $bundle->getPath().'/Resources/views';
                 }
                 if (is_dir($deprecatedPath = sprintf('%s/Resources/%s/translations', $rootDir, $bundle->getName()))) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -153,15 +153,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // Override with provided Bundle info
         if (null !== $input->getArgument('bundle')) {
             try {
-                $transPaths = [];
-                $viewsPaths = [];
                 $foundBundle = $kernel->getBundle($input->getArgument('bundle'));
+                $transPaths = [$foundBundle->getPath().'/Resources/translations'];
+                $viewsPaths = [$foundBundle->getPath().'/Resources/views'];
                 if (method_exists($foundBundle, 'getBundleDir')) {
-                    $transPaths = [$foundBundle->getBundleDir().'/translations'];
-                    $viewsPaths = [$foundBundle->getBundleDir().'/templates'];
-                } else {
-                    $transPaths = [$foundBundle->getPath().'/Resources/translations'];
-                    $viewsPaths = [$foundBundle->getPath().'/Resources/views'];
+                    if (is_dir($foundBundle->getBundleDir().'/translations')) {
+                        $transPaths = [$foundBundle->getBundleDir().'/translations'];
+                    }
+                    if (is_dir($foundBundle->getBundleDir().'/templates')) {
+                        $viewsPaths = [$foundBundle->getBundleDir().'/templates'];
+                    }
                 }
                 if ($this->defaultTransPath) {
                     $transPaths[] = $this->defaultTransPath;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/BundlePathsTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/BundlePathsTest.php
@@ -57,10 +57,10 @@ public function testCustomBundleTwigTemplatesPath()
     {
         static::bootKernel(['test_case' => 'BundlePaths']);
         $bundlesMetadata = static::$container->getParameter('kernel.bundles_metadata');
-        $bundlePath = $bundlesMetadata['ModernBundle']['dir'];
+        $bundleDir = $bundlesMetadata['ModernBundle']['dir'];
 
         $twig = static::$container->get('twig');
-        $this->assertSame([$bundlePath.'/templates'], $twig->getLoader()->getPaths('Modern'));
+        $this->assertSame([$bundleDir.'/templates'], $twig->getLoader()->getPaths('Modern'));
         $this->assertSame("OK\n", $twig->render('@Modern/index.html.twig'));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -57,10 +57,10 @@ public function testCustomBundleTwigTemplatesPath()`
`57`	`57`	`{`
`58`	`58`	`static::bootKernel(['test_case' => 'BundlePaths']);`
`59`	`59`	`$bundlesMetadata = static::$container->getParameter('kernel.bundles_metadata');`
`60`		`- $bundlePath = $bundlesMetadata['ModernBundle']['dir'];`
	`60`	`+ $bundleDir = $bundlesMetadata['ModernBundle']['dir'];`
`61`	`61`
`62`	`62`	`$twig = static::$container->get('twig');`
`63`		`- $this->assertSame([$bundlePath.'/templates'], $twig->getLoader()->getPaths('Modern'));`
	`63`	`+ $this->assertSame([$bundleDir.'/templates'], $twig->getLoader()->getPaths('Modern'));`
`64`	`64`	`$this->assertSame("OK\n", $twig->render('@Modern/index.html.twig'));`
`65`	`65`	`}`
`66`	`66`