mirror of
https://github.com/twigphp/Twig.git
synced 2026-08-31 04:27:00 +00:00
Merge branch '1.x' into 2.x
* 1.x: fixed CS Update TemplateWrapper.php bumped version to 1.40
This commit is contained in:
@@ -210,7 +210,7 @@
|
||||
* improved the performance of the filesystem loader
|
||||
* removed features that were deprecated in 1.x
|
||||
|
||||
* 1.39.2 (2019-XX-XX)
|
||||
* 1.40.0 (2019-XX-XX)
|
||||
|
||||
* allowed Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning)
|
||||
* added support for "Twig\Markup" instances in the "in" test
|
||||
|
||||
@@ -175,6 +175,7 @@ class FilesystemLoader implements LoaderInterface, ExistsLoaderInterface, Source
|
||||
if (null === ($path = $this->findTemplate($name)) || false === $path) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return filemtime($path) < $time;
|
||||
}
|
||||
|
||||
|
||||
@@ -122,7 +122,7 @@ final class TemplateWrapper
|
||||
return $this->template->getSourceContext();
|
||||
}
|
||||
|
||||
public function getTemplatename(): string
|
||||
public function getTemplateName(): string
|
||||
{
|
||||
return $this->template->getTemplateName();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user