Merge branch '1.x' into 2.x

* 1.x:
  fixed CS
  Update TemplateWrapper.php
  bumped version to 1.40
This commit is contained in:
Fabien Potencier
2019-04-24 17:24:15 +02:00
3 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -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
+1
View File
@@ -175,6 +175,7 @@ class FilesystemLoader implements LoaderInterface, ExistsLoaderInterface, Source
if (null === ($path = $this->findTemplate($name)) || false === $path) {
return false;
}
return filemtime($path) < $time;
}
+1 -1
View File
@@ -122,7 +122,7 @@ final class TemplateWrapper
return $this->template->getSourceContext();
}
public function getTemplatename(): string
public function getTemplateName(): string
{
return $this->template->getTemplateName();
}