Merge branch '1.x' into 2.x

fabpot · fabpot · commit 157fa5682927 · 2021-05-12T09:27:30.000+02:00
* 1.x:
  Fix CS
  Migrate to the new PHP CS Fixer config file
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -1,6 +1,6 @@
 <?php
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
@@ -16,5 +16,5 @@
         'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'all'],
     ])
     ->setRiskyAllowed(true)
-    ->setFinder(PhpCsFixer\Finder::create()->in(__DIR__))
+    ->setFinder((new PhpCsFixer\Finder())->in(__DIR__))
 ;
diff --git a/src/Cache/FilesystemCache.php b/src/Cache/FilesystemCache.php
@@ -18,7 +18,7 @@
  */
 class FilesystemCache implements CacheInterface
 {
-    const FORCE_BYTECODE_INVALIDATION = 1;
+    public const FORCE_BYTECODE_INVALIDATION = 1;
 
     private $directory;
     private $options;
@@ -67,7 +67,7 @@ public function write($key, $content)
 
             if (self::FORCE_BYTECODE_INVALIDATION == ($this->options & self::FORCE_BYTECODE_INVALIDATION)) {
                 // Compile cached file into bytecode cache
-                if (\function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) {
+                if (\function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN)) {
                     @opcache_invalidate($key, true);
                 } elseif (\function_exists('apc_compile_file')) {
                     apc_compile_file($key);
diff --git a/src/FileExtensionEscapingStrategy.php b/src/FileExtensionEscapingStrategy.php
@@ -41,7 +41,7 @@ public static function guess($name)
             $name = substr($name, 0, -5);
         }
 
-        $extension = pathinfo($name, PATHINFO_EXTENSION);
+        $extension = pathinfo($name, \PATHINFO_EXTENSION);
 
         switch ($extension) {
             case 'js':
diff --git a/src/Node/MacroNode.php b/src/Node/MacroNode.php
@@ -21,7 +21,7 @@
  */
 class MacroNode extends Node
 {
-    const VARARGS_NAME = 'varargs';
+    public const VARARGS_NAME = 'varargs';
 
     public function __construct(string $name, Node $body, Node $arguments, int $lineno, string $tag = null)
     {
diff --git a/src/Profiler/Profile.php b/src/Profiler/Profile.php
@@ -18,10 +18,10 @@
  */
 class Profile implements \IteratorAggregate, \Serializable
 {
-    const ROOT = 'ROOT';
-    const BLOCK = 'block';
-    const TEMPLATE = 'template';
-    const MACRO = 'macro';
+    public const ROOT = 'ROOT';
+    public const BLOCK = 'block';
+    public const TEMPLATE = 'template';
+    public const MACRO = 'macro';
 
     private $template;
     private $name;
diff --git a/src/Test/IntegrationTestCase.php b/src/Test/IntegrationTestCase.php
@@ -120,7 +120,7 @@ public function getTests($name, $legacyTests = false)
                 $deprecation = $match[3];
                 $templates = self::parseTemplates($match[4]);
                 $exception = false;
-                preg_match_all('/--DATA--(.*?)(?:--CONFIG--(.*?))?--EXPECT--(.*?)(?=\-\-DATA\-\-|$)/s', $test, $outputs, PREG_SET_ORDER);
+                preg_match_all('/--DATA--(.*?)(?:--CONFIG--(.*?))?--EXPECT--(.*?)(?=\-\-DATA\-\-|$)/s', $test, $outputs, \PREG_SET_ORDER);
             } else {
                 throw new \InvalidArgumentException(sprintf('Test "%s" is not valid.', str_replace($fixturesDir.'/', '', $file)));
             }
@@ -255,7 +255,7 @@ protected function doIntegrationTest($file, $message, $condition, $templates, $e
     protected static function parseTemplates($test)
     {
         $templates = [];
-        preg_match_all('/--TEMPLATE(?:\((.*?)\))?--(.*?)(?=\-\-TEMPLATE|$)/s', $test, $matches, PREG_SET_ORDER);
+        preg_match_all('/--TEMPLATE(?:\((.*?)\))?--(.*?)(?=\-\-TEMPLATE|$)/s', $test, $matches, \PREG_SET_ORDER);
         foreach ($matches as $match) {
             $templates[($match[1] ?: 'index.twig')] = $match[2];
         }
diff --git a/src/Token.php b/src/Token.php
@@ -23,20 +23,20 @@ final class Token
     private $type;
     private $lineno;
 
-    const EOF_TYPE = -1;
-    const TEXT_TYPE = 0;
-    const BLOCK_START_TYPE = 1;
-    const VAR_START_TYPE = 2;
-    const BLOCK_END_TYPE = 3;
-    const VAR_END_TYPE = 4;
-    const NAME_TYPE = 5;
-    const NUMBER_TYPE = 6;
-    const STRING_TYPE = 7;
-    const OPERATOR_TYPE = 8;
-    const PUNCTUATION_TYPE = 9;
-    const INTERPOLATION_START_TYPE = 10;
-    const INTERPOLATION_END_TYPE = 11;
-    const ARROW_TYPE = 12;
+    public const EOF_TYPE = -1;
+    public const TEXT_TYPE = 0;
+    public const BLOCK_START_TYPE = 1;
+    public const VAR_START_TYPE = 2;
+    public const BLOCK_END_TYPE = 3;
+    public const VAR_END_TYPE = 4;
+    public const NAME_TYPE = 5;
+    public const NUMBER_TYPE = 6;
+    public const STRING_TYPE = 7;
+    public const OPERATOR_TYPE = 8;
+    public const PUNCTUATION_TYPE = 9;
+    public const INTERPOLATION_START_TYPE = 10;
+    public const INTERPOLATION_END_TYPE = 11;
+    public const ARROW_TYPE = 12;
 
     /**
      * @param int    $type   The type of the token
diff --git a/tests/CompilerTest.php b/tests/CompilerTest.php
@@ -22,19 +22,19 @@ public function testReprNumericValueWithLocale()
     {
         $compiler = new Compiler(new Environment($this->createMock(LoaderInterface::class)));
 
-        $locale = setlocale(LC_NUMERIC, 0);
+        $locale = setlocale(\LC_NUMERIC, 0);
         if (false === $locale) {
             $this->markTestSkipped('Your platform does not support locales.');
         }
 
         $required_locales = ['fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8', 'French_France.1252'];
-        if (false === setlocale(LC_NUMERIC, $required_locales)) {
+        if (false === setlocale(\LC_NUMERIC, $required_locales)) {
             $this->markTestSkipped('Could not set any of required locales: '.implode(', ', $required_locales));
         }
 
         $this->assertEquals('1.2', $compiler->repr(1.2)->getSource());
-        $this->assertStringContainsString('fr', strtolower(setlocale(LC_NUMERIC, 0)));
+        $this->assertStringContainsString('fr', strtolower(setlocale(\LC_NUMERIC, 0)));
 
-        setlocale(LC_NUMERIC, $locale);
+        setlocale(\LC_NUMERIC, $locale);
     }
 }
diff --git a/tests/ErrorTest.php b/tests/ErrorTest.php
@@ -285,14 +285,14 @@ public function getErroredTemplates()
 
     public function testTwigLeakOutputInDebugMode()
     {
-        $output = exec(sprintf('%s %s debug', PHP_BINARY, escapeshellarg(__DIR__.'/Fixtures/errors/leak-output.php')));
+        $output = exec(sprintf('%s %s debug', \PHP_BINARY, escapeshellarg(__DIR__.'/Fixtures/errors/leak-output.php')));
 
         $this->assertSame('Hello OOPS', $output);
     }
 
     public function testDoesNotTwigLeakOutput()
     {
-        $output = exec(sprintf('%s %s', PHP_BINARY, escapeshellarg(__DIR__.'/Fixtures/errors/leak-output.php')));
+        $output = exec(sprintf('%s %s', \PHP_BINARY, escapeshellarg(__DIR__.'/Fixtures/errors/leak-output.php')));
 
         $this->assertSame('', $output);
     }
diff --git a/tests/Extension/StringLoaderExtensionTest.php b/tests/Extension/StringLoaderExtensionTest.php
@@ -11,8 +11,8 @@
 
 namespace Twig\Tests\Extension;
 
-use Twig\Environment;
 use PHPUnit\Framework\TestCase;
+use Twig\Environment;
 use Twig\Extension\StringLoaderExtension;
 
 class StringLoaderExtensionTest extends TestCase
@@ -21,6 +21,6 @@ public function testIncludeWithTemplateStringAndNoSandbox()
     {
         $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
         $twig->addExtension(new StringLoaderExtension());
-        $this->assertSame('something', twig_include($twig, [], twig_template_from_string($twig, "something")));
+        $this->assertSame('something', twig_include($twig, [], twig_template_from_string($twig, 'something')));
     }
 }
diff --git a/tests/IntegrationTest.php b/tests/IntegrationTest.php
@@ -59,7 +59,7 @@ function test_foo($value = 'foo')
 
 class TwigTestFoo implements \Iterator
 {
-    const BAR_NAME = 'bar';
+    public const BAR_NAME = 'bar';
 
     public $position = 0;
     public $array = [1, 2];

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public static function guess($name)`
`41`	`41`	`$name = substr($name, 0, -5);`
`42`	`42`	`}`
`43`	`43`
`44`		`- $extension = pathinfo($name, PATHINFO_EXTENSION);`
	`44`	`+ $extension = pathinfo($name, \PATHINFO_EXTENSION);`
`45`	`45`
`46`	`46`	`switch ($extension) {`
`47`	`47`	`case 'js':`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*/`
`22`	`22`	`class MacroNode extends Node`
`23`	`23`	`{`
`24`		`- const VARARGS_NAME = 'varargs';`
	`24`	`+ public const VARARGS_NAME = 'varargs';`
`25`	`25`
`26`	`26`	`public function __construct(string $name, Node $body, Node $arguments, int $lineno, string $tag = null)`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public function getTests($name, $legacyTests = false)`
`120`	`120`	`$deprecation = $match[3];`
`121`	`121`	`$templates = self::parseTemplates($match[4]);`
`122`	`122`	`$exception = false;`
`123`		`- preg_match_all('/--DATA--(.?)(?:--CONFIG--(.?))?--EXPECT--(.*?)(?=\-\-DATA\-\-\|$)/s', $test, $outputs, PREG_SET_ORDER);`
	`123`	`+ preg_match_all('/--DATA--(.?)(?:--CONFIG--(.?))?--EXPECT--(.*?)(?=\-\-DATA\-\-\|$)/s', $test, $outputs, \PREG_SET_ORDER);`
`124`	`124`	`} else {`
`125`	`125`	`throw new \InvalidArgumentException(sprintf('Test "%s" is not valid.', str_replace($fixturesDir.'/', '', $file)));`
`126`	`126`	`}`
`@@ -255,7 +255,7 @@ protected function doIntegrationTest($file, $message, $condition, $templates, $e`
`255`	`255`	`protected static function parseTemplates($test)`
`256`	`256`	`{`
`257`	`257`	`$templates = [];`
`258`		`- preg_match_all('/--TEMPLATE(?:\((.?)\))?--(.?)(?=\-\-TEMPLATE\|$)/s', $test, $matches, PREG_SET_ORDER);`
	`258`	`+ preg_match_all('/--TEMPLATE(?:\((.?)\))?--(.?)(?=\-\-TEMPLATE\|$)/s', $test, $matches, \PREG_SET_ORDER);`
`259`	`259`	`foreach ($matches as $match) {`
`260`	`260`	`$templates[($match[1] ?: 'index.twig')] = $match[2];`
`261`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,19 +22,19 @@ public function testReprNumericValueWithLocale()`
`22`	`22`	`{`
`23`	`23`	`$compiler = new Compiler(new Environment($this->createMock(LoaderInterface::class)));`
`24`	`24`
`25`		`- $locale = setlocale(LC_NUMERIC, 0);`
	`25`	`+ $locale = setlocale(\LC_NUMERIC, 0);`
`26`	`26`	`if (false === $locale) {`
`27`	`27`	`$this->markTestSkipped('Your platform does not support locales.');`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`$required_locales = ['fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8', 'French_France.1252'];`
`31`		`- if (false === setlocale(LC_NUMERIC, $required_locales)) {`
	`31`	`+ if (false === setlocale(\LC_NUMERIC, $required_locales)) {`
`32`	`32`	`$this->markTestSkipped('Could not set any of required locales: '.implode(', ', $required_locales));`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`$this->assertEquals('1.2', $compiler->repr(1.2)->getSource());`
`36`		`- $this->assertStringContainsString('fr', strtolower(setlocale(LC_NUMERIC, 0)));`
	`36`	`+ $this->assertStringContainsString('fr', strtolower(setlocale(\LC_NUMERIC, 0)));`
`37`	`37`
`38`		`- setlocale(LC_NUMERIC, $locale);`
	`38`	`+ setlocale(\LC_NUMERIC, $locale);`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -285,14 +285,14 @@ public function getErroredTemplates()`
`285`	`285`
`286`	`286`	`public function testTwigLeakOutputInDebugMode()`
`287`	`287`	`{`
`288`		`- $output = exec(sprintf('%s %s debug', PHP_BINARY, escapeshellarg(__DIR__.'/Fixtures/errors/leak-output.php')));`
	`288`	`+ $output = exec(sprintf('%s %s debug', \PHP_BINARY, escapeshellarg(__DIR__.'/Fixtures/errors/leak-output.php')));`
`289`	`289`
`290`	`290`	`$this->assertSame('Hello OOPS', $output);`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`public function testDoesNotTwigLeakOutput()`
`294`	`294`	`{`
`295`		`- $output = exec(sprintf('%s %s', PHP_BINARY, escapeshellarg(__DIR__.'/Fixtures/errors/leak-output.php')));`
	`295`	`+ $output = exec(sprintf('%s %s', \PHP_BINARY, escapeshellarg(__DIR__.'/Fixtures/errors/leak-output.php')));`
`296`	`296`
`297`	`297`	`$this->assertSame('', $output);`
`298`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Twig\Tests\Extension;`
`13`	`13`
`14`		`-use Twig\Environment;`
`15`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Twig\Environment;`
`16`	`16`	`use Twig\Extension\StringLoaderExtension;`
`17`	`17`
`18`	`18`	`class StringLoaderExtensionTest extends TestCase`
`@@ -21,6 +21,6 @@ public function testIncludeWithTemplateStringAndNoSandbox()`
`21`	`21`	`{`
`22`	`22`	`$twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));`
`23`	`23`	`$twig->addExtension(new StringLoaderExtension());`
`24`		`- $this->assertSame('something', twig_include($twig, [], twig_template_from_string($twig, "something")));`
	`24`	`+ $this->assertSame('something', twig_include($twig, [], twig_template_from_string($twig, 'something')));`
`25`	`25`	`}`
`26`	`26`	`}`