bug #34877 [TwigBundle] fix findTemplate() to return null

dpesch · dpesch · commit ff1d77e15586 · 2019-12-10T12:13:11.000+01:00
Twig3 FilesystemLoader::findTemplate() should return `string|null` instead of Twig2 `string|null|false`: see <https://github.com/twigphp/Twig/blob/3.x/src/Loader/FilesystemLoader.php#L167> Returning `null` fixes `exists()` of Twig 3 FilesystemLoader without breaking Twig 2 (which expected `null` or `false` for not found templates). Change the test to assert `null` instead of `false`.
diff --git a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
@@ -96,7 +96,7 @@ protected function findTemplate($template, $throw = true)
                 throw $twigLoaderException;
             }
 
-            return false;
+            return null;
         }
 
         return $this->cache[$logicalName] = $file;
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
@@ -123,6 +123,6 @@ public function testTwigSoftErrorIfTemplateDoesNotExist()
 
         $method = new \ReflectionMethod('Symfony\Bundle\TwigBundle\Loader\FilesystemLoader', 'findTemplate');
         $method->setAccessible(true);
-        $this->assertFalse($method->invoke($loader, 'name.format.engine', false));
+        $this->assertNull($method->invoke($loader, 'name.format.engine', false));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ protected function findTemplate($template, $throw = true)`
`96`	`96`	`throw $twigLoaderException;`
`97`	`97`	`}`
`98`	`98`
`99`		`- return false;`
	`99`	`+ return null;`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`return $this->cache[$logicalName] = $file;`
Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,6 @@ public function testTwigSoftErrorIfTemplateDoesNotExist()`
`123`	`123`
`124`	`124`	`$method = new \ReflectionMethod('Symfony\Bundle\TwigBundle\Loader\FilesystemLoader', 'findTemplate');`
`125`	`125`	`$method->setAccessible(true);`
`126`		`- $this->assertFalse($method->invoke($loader, 'name.format.engine', false));`
	`126`	`+ $this->assertNull($method->invoke($loader, 'name.format.engine', false));`
`127`	`127`	`}`
`128`	`128`	`}`