Skip to content

Commit

Permalink
Merge branch '4.4' into 5.1
Browse files Browse the repository at this point in the history
* 4.4:
  Enable "native_constant_invocation" CS rule
  Make AbstractPhpFileCacheWarmer public
  • Loading branch information
nicolas-grekas committed Sep 2, 2020
2 parents e999847 + 7c5e32d commit da663fb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Loader/FilesystemLoader.php
Expand Up @@ -103,7 +103,7 @@ protected static function isAbsolutePath(string $file)
&& ':' == $file[1]
&& ('\\' == $file[2] || '/' == $file[2])
)
|| null !== parse_url($file, PHP_URL_SCHEME)
|| null !== parse_url($file, \PHP_URL_SCHEME)
) {
return true;
}
Expand Down
6 changes: 3 additions & 3 deletions PhpEngine.php
Expand Up @@ -138,7 +138,7 @@ protected function evaluate(Storage $template, array $parameters = [])
// the view variable is exposed to the require file below
$view = $this;
if ($this->evalTemplate instanceof FileStorage) {
extract($this->evalParameters, EXTR_SKIP);
extract($this->evalParameters, \EXTR_SKIP);
$this->evalParameters = null;

ob_start();
Expand All @@ -148,7 +148,7 @@ protected function evaluate(Storage $template, array $parameters = [])

return ob_get_clean();
} elseif ($this->evalTemplate instanceof StringStorage) {
extract($this->evalParameters, EXTR_SKIP);
extract($this->evalParameters, \EXTR_SKIP);
$this->evalParameters = null;

ob_start();
Expand Down Expand Up @@ -393,7 +393,7 @@ public function getGlobals()
*/
protected function initializeEscapers()
{
$flags = ENT_QUOTES | ENT_SUBSTITUTE;
$flags = \ENT_QUOTES | \ENT_SUBSTITUTE;

$this->escapers = [
'html' =>
Expand Down

0 comments on commit da663fb

Please sign in to comment.