Enhance the twig not found exception

behnoushnorouzi · behnoushnorouzi · commit de2c9527c3df · 2018-06-07T11:33:05.000+02:00
diff --git a/src/Symfony/Bundle/TwigBundle/Loader/NativeFilesystemLoader.php b/src/Symfony/Bundle/TwigBundle/Loader/NativeFilesystemLoader.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Loader;
+
+use Twig\Error\LoaderError;
+use Twig\Loader\FilesystemLoader;
+
+class NativeFilesystemLoader extends FilesystemLoader
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function findTemplate($template, $throw = true)
+    {
+        try {
+            return parent::findTemplate($template, $throw);
+        } catch (LoaderError $e) {
+            if ($e instanceof \Twig_Error_Loader && preg_match('/^([^:]*?)(?:Bundle)?:([^:]*+):(.+\.[^\.]+\.[^\.]+)$/', $template, $m) && 0 !== strpos($template, '@')) {
+                if ('' !== $m[2]) {
+                    $m[3] = $m[2].'/'.$m[3];
+                }
+                if ('' !== $m[1]) {
+                    $suggestion = '@'.$m[1].'/'.$m[3];
+                } else {
+                    $suggestion = $m[3];
+                }
+                if (false === parent::findTemplate($suggestion, false)) {
+                    throw $e;
+                }
+
+                throw new LoaderError(sprintf('Template reference "%s" not found, did you mean "%s"?', $template, $suggestion), -1, null, $e);
+            }
+
+            throw $e;
+        }
+    }
+}
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -50,7 +50,7 @@
             <argument type="service" id="twig.template_iterator" />
         </service>
 
-        <service id="twig.loader.native_filesystem" class="Twig\Loader\FilesystemLoader">
+        <service id="twig.loader.native_filesystem" class="Symfony\Bundle\TwigBundle\Loader\NativeFilesystemLoader">
             <argument type="collection" /> <!-- paths -->
             <argument>%kernel.project_dir%</argument>
             <tag name="twig.loader"/>
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Loader/NativeFilesystemLoaderTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Loader/NativeFilesystemLoaderTest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Symfony\Bundle\TwigBundle\Tests\Loader;
+
+use Symfony\Bundle\TwigBundle\Loader\NativeFilesystemLoader;
+use Symfony\Bundle\TwigBundle\Tests\TestCase;
+
+class NativeFilesystemLoaderTest extends TestCase
+{
+    public function testWithNativeNamespace()
+    {
+        $loader = new NativeFilesystemLoader(null, __DIR__.'/../');
+        $loader->addPath('Fixtures/templates', 'Test');
+
+        $this->assertSame('Fixtures/templates/Foo/index.html.twig', $loader->getCacheKey('@Test/Foo/index.html.twig'));
+    }
+
+    /**
+     * @expectedException \Twig\Error\LoaderError
+     * @expectedExceptionMessage Template reference "TestBundle::Foo/index.html.twig" not found, did you mean "@Test/Foo/index.html.twig"?
+     */
+    public function testWithLegacyStyle1()
+    {
+        $loader = new NativeFilesystemLoader(null, __DIR__.'/../');
+        $loader->addPath('Fixtures/templates', 'Test');
+
+        $loader->getCacheKey('TestBundle::Foo/index.html.twig');
+    }
+
+    /**
+     * @expectedException \Twig\Error\LoaderError
+     * @expectedExceptionMessage Template reference "TestBundle:Foo:index.html.twig" not found, did you mean "@Test/Foo/index.html.twig"?
+     */
+    public function testWithLegacyStyle2()
+    {
+        $loader = new NativeFilesystemLoader(null, __DIR__ . '/../');
+        $loader->addPath('Fixtures/templates', 'Test');
+
+        $loader->getCacheKey('TestBundle:Foo:index.html.twig');
+    }
+}
