[TwigBundle] changed the runtime loader to return null if there is no match

fabpot · fabpot · commit c03fd8000051 · 2016-10-01T09:47:53.000-07:00
diff --git a/src/Symfony/Bundle/TwigBundle/ContainerAwareRuntimeLoader.php b/src/Symfony/Bundle/TwigBundle/ContainerAwareRuntimeLoader.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\TwigBundle;
 
+use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -22,22 +23,26 @@ class ContainerAwareRuntimeLoader implements \Twig_RuntimeLoaderInterface
 {
     private $container;
     private $mapping;
+    private $logger;
 
-    public function __construct(ContainerInterface $container, array $mapping)
+    public function __construct(ContainerInterface $container, array $mapping, LoggerInterface $logger = null)
     {
         $this->container = $container;
         $this->mapping = $mapping;
+        $this->logger = $logger;
     }
 
     /**
      * {@inheritdoc}
      */
     public function load($class)
     {
-        if (!isset($this->mapping[$class])) {
-            throw new \LogicException(sprintf('Class "%s" is not configured as a Twig runtime. Add the "twig.runtime" tag to the related service in the container.', $class));
+        if (isset($this->mapping[$class])) {
+            return $this->container->get($this->mapping[$class]);
         }
 
-        return $this->container->get($this->mapping[$class]);
+        if (null !== $this->logger) {
+            $this->logger->warning(sprintf('Class "%s" is not configured as a Twig runtime. Add the "twig.runtime" tag to the related service in the container.', $class));
+        }
     }
 }
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -165,6 +165,7 @@
         <service id="twig.runtime_loader" class="Symfony\Bundle\TwigBundle\ContainerAwareRuntimeLoader" public="false">
             <argument type="service" id="service_container" />
             <argument type="collection" /> <!-- the mapping between class names and service names -->
+            <argument type="service" id="logger" on-invalid="null" />
         </service>
     </services>
 </container>
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/ContainerAwareRuntimeLoaderTest.php b/src/Symfony/Bundle/TwigBundle/Tests/ContainerAwareRuntimeLoaderTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\TwigBundle\Tests;
 
+use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Bundle\TwigBundle\ContainerAwareRuntimeLoader;
 
@@ -27,13 +28,11 @@ public function testLoad()
         $loader->load('FooClass');
     }
 
-    /**
-     * @expectedException        \LogicException
-     * @expectedExceptionMessage Class "BarClass" is not configured as a Twig runtime.
-     */
     public function testLoadWithoutAMatch()
     {
-        $loader = new ContainerAwareRuntimeLoader($this->getMockBuilder(ContainerInterface::class)->getMock(), array());
-        $loader->load('BarClass');
+        $logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
+        $logger->expects($this->once())->method('warning')->with('Class "BarClass" is not configured as a Twig runtime. Add the "twig.runtime" tag to the related service in the container.');
+        $loader = new ContainerAwareRuntimeLoader($this->getMockBuilder(ContainerInterface::class)->getMock(), array(), $logger);
+        $this->assertNull($loader->load('BarClass'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\TwigBundle;`
`13`	`13`
	`14`	`+use Psr\Log\LoggerInterface;`
`14`	`15`	`use Symfony\Component\DependencyInjection\ContainerInterface;`
`15`	`16`
`16`	`17`	`/**`
`@@ -22,22 +23,26 @@ class ContainerAwareRuntimeLoader implements \Twig_RuntimeLoaderInterface`
`22`	`23`	`{`
`23`	`24`	`private $container;`
`24`	`25`	`private $mapping;`
	`26`	`+ private $logger;`
`25`	`27`
`26`		`- public function __construct(ContainerInterface $container, array $mapping)`
	`28`	`+ public function __construct(ContainerInterface $container, array $mapping, LoggerInterface $logger = null)`
`27`	`29`	`{`
`28`	`30`	`$this->container = $container;`
`29`	`31`	`$this->mapping = $mapping;`
	`32`	`+ $this->logger = $logger;`
`30`	`33`	`}`
`31`	`34`
`32`	`35`	`/**`
`33`	`36`	`* {@inheritdoc}`
`34`	`37`	`*/`
`35`	`38`	`public function load($class)`
`36`	`39`	`{`
`37`		`- if (!isset($this->mapping[$class])) {`
`38`		`- throw new \LogicException(sprintf('Class "%s" is not configured as a Twig runtime. Add the "twig.runtime" tag to the related service in the container.', $class));`
	`40`	`+ if (isset($this->mapping[$class])) {`
	`41`	`+ return $this->container->get($this->mapping[$class]);`
`39`	`42`	`}`
`40`	`43`
`41`		`- return $this->container->get($this->mapping[$class]);`
	`44`	`+ if (null !== $this->logger) {`
	`45`	`+ $this->logger->warning(sprintf('Class "%s" is not configured as a Twig runtime. Add the "twig.runtime" tag to the related service in the container.', $class));`
	`46`	`+ }`
`42`	`47`	`}`
`43`	`48`	`}`