[FrameworkBundle][Template name] fixed "the template format is invalid."

aitboudad · aitboudad · commit 0305ce70cb30 · 2014-10-18T23:09:36.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Templating;
 
-use Symfony\Component\Templating\TemplateNameParserInterface;
 use Symfony\Component\Templating\TemplateReferenceInterface;
 use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\Templating\TemplateNameParser as BaseTemplateNameParser;
 
 /**
  * TemplateNameParser converts template names from the short notation
@@ -22,7 +22,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class TemplateNameParser implements TemplateNameParserInterface
+class TemplateNameParser extends BaseTemplateNameParser
 {
     protected $kernel;
     protected $cache = array();
@@ -56,7 +56,7 @@ public function parse($name)
         }
 
         if (!preg_match('/^([^:]*):([^:]*):(.+)\.([^\.]+)\.([^\.]+)$/', $name, $matches)) {
-            throw new \InvalidArgumentException(sprintf('Template name "%s" is not valid (format is "bundle:section:template.format.engine").', $name));
+            return parent::parse($name);
         }
 
         $template = new TemplateReference($matches[1], $matches[2], $matches[3], $matches[4], $matches[5]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php
@@ -14,6 +14,7 @@
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Bundle\FrameworkBundle\Templating\TemplateNameParser;
 use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
+use Symfony\Component\Templating\TemplateReference as BaseTemplateReference;
 
 class TemplateNameParserTest extends TestCase
 {
@@ -63,25 +64,17 @@ public function getLogicalNameToTemplateProvider()
             array(':Post:index.html.php', new TemplateReference('', 'Post', 'index', 'html', 'php')),
             array('::index.html.php', new TemplateReference('', '', 'index', 'html', 'php')),
             array('FooBundle:Post:foo.bar.index.html.php', new TemplateReference('FooBundle', 'Post', 'foo.bar.index', 'html', 'php')),
+            array('/path/to/section/name.php', new BaseTemplateReference('/path/to/section/name.php', 'php')),
+            array('name.twig', new BaseTemplateReference('name.twig', 'twig')),
+            array('name', new BaseTemplateReference('name')),
         );
     }
 
     /**
-     * @dataProvider      getInvalidLogicalNameProvider
      * @expectedException \InvalidArgumentException
      */
-    public function testParseInvalidName($name)
+    public function testParseValidNameWithNotFoundBundle()
     {
-        $this->parser->parse($name);
-    }
-
-    public function getInvalidLogicalNameProvider()
-    {
-        return array(
-            array('BarBundle:Post:index.html.php'),
-            array('FooBundle:Post:index'),
-            array('FooBundle:Post'),
-            array('FooBundle:Post:foo:bar'),
-        );
+        $this->parser->parse('BarBundle:Post:index.html.php');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Templating;`
`13`	`13`
`14`		`-use Symfony\Component\Templating\TemplateNameParserInterface;`
`15`	`14`	`use Symfony\Component\Templating\TemplateReferenceInterface;`
`16`	`15`	`use Symfony\Component\HttpKernel\KernelInterface;`
	`16`	`+use Symfony\Component\Templating\TemplateNameParser as BaseTemplateNameParser;`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* TemplateNameParser converts template names from the short notation`
`@@ -22,7 +22,7 @@`
`22`	`22`	`*`
`23`	`23`	`* @author Fabien Potencier <fabien@symfony.com>`
`24`	`24`	`*/`
`25`		`-class TemplateNameParser implements TemplateNameParserInterface`
	`25`	`+class TemplateNameParser extends BaseTemplateNameParser`
`26`	`26`	`{`
`27`	`27`	`protected $kernel;`
`28`	`28`	`protected $cache = array();`
`@@ -56,7 +56,7 @@ public function parse($name)`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`if (!preg_match('/^([^:]):([^:]):(.+)\.([^\.]+)\.([^\.]+)$/', $name, $matches)) {`
`59`		`- throw new \InvalidArgumentException(sprintf('Template name "%s" is not valid (format is "bundle:section:template.format.engine").', $name));`
	`59`	`+ return parent::parse($name);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`$template = new TemplateReference($matches[1], $matches[2], $matches[3], $matches[4], $matches[5]);`