Bump minimum version of PHP to 8.1

nicolas-grekas · fabpot · commit 644db5cf5334 · 2022-02-25T12:15:52.000+01:00
diff --git a/Command/DebugCommand.php b/Command/DebugCommand.php
@@ -294,7 +294,7 @@ private function getLoaderPaths(string $name = null): array
             }
 
             foreach ($namespaces as $namespace) {
-                $paths = array_map([$this, 'getRelativePath'], $loader->getPaths($namespace));
+                $paths = array_map($this->getRelativePath(...), $loader->getPaths($namespace));
 
                 if (FilesystemLoader::MAIN_NAMESPACE === $namespace) {
                     $namespace = '(None)';
diff --git a/ErrorRenderer/TwigErrorRenderer.php b/ErrorRenderer/TwigErrorRenderer.php
@@ -36,7 +36,7 @@ public function __construct(Environment $twig, HtmlErrorRenderer $fallbackErrorR
     {
         $this->twig = $twig;
         $this->fallbackErrorRenderer = $fallbackErrorRenderer ?? new HtmlErrorRenderer();
-        $this->debug = !\is_callable($debug) || $debug instanceof \Closure ? $debug : \Closure::fromCallable($debug);
+        $this->debug = \is_bool($debug) ? $debug : $debug(...);
     }
 
     /**
diff --git a/Extension/AssetExtension.php b/Extension/AssetExtension.php
@@ -35,8 +35,8 @@ public function __construct(Packages $packages)
     public function getFunctions(): array
     {
         return [
-            new TwigFunction('asset', [$this, 'getAssetUrl']),
-            new TwigFunction('asset_version', [$this, 'getAssetVersion']),
+            new TwigFunction('asset', $this->getAssetUrl(...)),
+            new TwigFunction('asset_version', $this->getAssetVersion(...)),
         ];
     }
 
diff --git a/Extension/CodeExtension.php b/Extension/CodeExtension.php
@@ -39,16 +39,16 @@ public function __construct(string|FileLinkFormatter $fileLinkFormat, string $pr
     public function getFilters(): array
     {
         return [
-            new TwigFilter('abbr_class', [$this, 'abbrClass'], ['is_safe' => ['html']]),
-            new TwigFilter('abbr_method', [$this, 'abbrMethod'], ['is_safe' => ['html']]),
-            new TwigFilter('format_args', [$this, 'formatArgs'], ['is_safe' => ['html']]),
-            new TwigFilter('format_args_as_text', [$this, 'formatArgsAsText']),
-            new TwigFilter('file_excerpt', [$this, 'fileExcerpt'], ['is_safe' => ['html']]),
-            new TwigFilter('format_file', [$this, 'formatFile'], ['is_safe' => ['html']]),
-            new TwigFilter('format_file_from_text', [$this, 'formatFileFromText'], ['is_safe' => ['html']]),
-            new TwigFilter('format_log_message', [$this, 'formatLogMessage'], ['is_safe' => ['html']]),
-            new TwigFilter('file_link', [$this, 'getFileLink']),
-            new TwigFilter('file_relative', [$this, 'getFileRelative']),
+            new TwigFilter('abbr_class', $this->abbrClass(...), ['is_safe' => ['html']]),
+            new TwigFilter('abbr_method', $this->abbrMethod(...), ['is_safe' => ['html']]),
+            new TwigFilter('format_args', $this->formatArgs(...), ['is_safe' => ['html']]),
+            new TwigFilter('format_args_as_text', $this->formatArgsAsText(...)),
+            new TwigFilter('file_excerpt', $this->fileExcerpt(...), ['is_safe' => ['html']]),
+            new TwigFilter('format_file', $this->formatFile(...), ['is_safe' => ['html']]),
+            new TwigFilter('format_file_from_text', $this->formatFileFromText(...), ['is_safe' => ['html']]),
+            new TwigFilter('format_log_message', $this->formatLogMessage(...), ['is_safe' => ['html']]),
+            new TwigFilter('file_link', $this->getFileLink(...)),
+            new TwigFilter('file_relative', $this->getFileRelative(...)),
         ];
     }
 
diff --git a/Extension/DumpExtension.php b/Extension/DumpExtension.php
@@ -41,7 +41,7 @@ public function __construct(ClonerInterface $cloner, HtmlDumper $dumper = null)
     public function getFunctions(): array
     {
         return [
-            new TwigFunction('dump', [$this, 'dump'], ['is_safe' => ['html'], 'needs_context' => true, 'needs_environment' => true]),
+            new TwigFunction('dump', $this->dump(...), ['is_safe' => ['html'], 'needs_context' => true, 'needs_environment' => true]),
         ];
     }
 
diff --git a/Extension/ExpressionExtension.php b/Extension/ExpressionExtension.php
@@ -28,7 +28,7 @@ final class ExpressionExtension extends AbstractExtension
     public function getFunctions(): array
     {
         return [
-            new TwigFunction('expression', [$this, 'createExpression']),
+            new TwigFunction('expression', $this->createExpression(...)),
         ];
     }
 
diff --git a/Extension/FormExtension.php b/Extension/FormExtension.php
@@ -68,12 +68,12 @@ public function getFunctions(): array
             new TwigFunction('form_end', null, ['node_class' => RenderBlockNode::class, 'is_safe' => ['html']]),
             new TwigFunction('csrf_token', [FormRenderer::class, 'renderCsrfToken']),
             new TwigFunction('form_parent', 'Symfony\Bridge\Twig\Extension\twig_get_form_parent'),
-            new TwigFunction('field_name', [$this, 'getFieldName']),
-            new TwigFunction('field_value', [$this, 'getFieldValue']),
-            new TwigFunction('field_label', [$this, 'getFieldLabel']),
-            new TwigFunction('field_help', [$this, 'getFieldHelp']),
-            new TwigFunction('field_errors', [$this, 'getFieldErrors']),
-            new TwigFunction('field_choices', [$this, 'getFieldChoices']),
+            new TwigFunction('field_name', $this->getFieldName(...)),
+            new TwigFunction('field_value', $this->getFieldValue(...)),
+            new TwigFunction('field_label', $this->getFieldLabel(...)),
+            new TwigFunction('field_help', $this->getFieldHelp(...)),
+            new TwigFunction('field_errors', $this->getFieldErrors(...)),
+            new TwigFunction('field_choices', $this->getFieldChoices(...)),
         ];
     }
 
diff --git a/Extension/HttpFoundationExtension.php b/Extension/HttpFoundationExtension.php
@@ -36,8 +36,8 @@ public function __construct(UrlHelper $urlHelper)
     public function getFunctions(): array
     {
         return [
-            new TwigFunction('absolute_url', [$this, 'generateAbsoluteUrl']),
-            new TwigFunction('relative_path', [$this, 'generateRelativePath']),
+            new TwigFunction('absolute_url', $this->generateAbsoluteUrl(...)),
+            new TwigFunction('relative_path', $this->generateRelativePath(...)),
         ];
     }
 
diff --git a/Extension/LogoutUrlExtension.php b/Extension/LogoutUrlExtension.php
@@ -35,8 +35,8 @@ public function __construct(LogoutUrlGenerator $generator)
     public function getFunctions(): array
     {
         return [
-            new TwigFunction('logout_url', [$this, 'getLogoutUrl']),
-            new TwigFunction('logout_path', [$this, 'getLogoutPath']),
+            new TwigFunction('logout_url', $this->getLogoutUrl(...)),
+            new TwigFunction('logout_path', $this->getLogoutPath(...)),
         ];
     }
 
diff --git a/Extension/RoutingExtension.php b/Extension/RoutingExtension.php
@@ -38,8 +38,8 @@ public function __construct(UrlGeneratorInterface $generator)
     public function getFunctions(): array
     {
         return [
-            new TwigFunction('url', [$this, 'getUrl'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),
-            new TwigFunction('path', [$this, 'getPath'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),
+            new TwigFunction('url', $this->getUrl(...), ['is_safe_callback' => $this->isUrlGenerationSafe(...)]),
+            new TwigFunction('path', $this->getPath(...), ['is_safe_callback' => $this->isUrlGenerationSafe(...)]),
         ];
     }
 
diff --git a/Extension/SecurityExtension.php b/Extension/SecurityExtension.php
@@ -75,9 +75,9 @@ public function getImpersonateExitPath(string $exitTo = null): string
     public function getFunctions(): array
     {
         return [
-            new TwigFunction('is_granted', [$this, 'isGranted']),
-            new TwigFunction('impersonation_exit_url', [$this, 'getImpersonateExitUrl']),
-            new TwigFunction('impersonation_exit_path', [$this, 'getImpersonateExitPath']),
+            new TwigFunction('is_granted', $this->isGranted(...)),
+            new TwigFunction('impersonation_exit_url', $this->getImpersonateExitUrl(...)),
+            new TwigFunction('impersonation_exit_path', $this->getImpersonateExitPath(...)),
         ];
     }
 }
diff --git a/Extension/TranslationExtension.php b/Extension/TranslationExtension.php
@@ -64,7 +64,7 @@ public function getTranslator(): TranslatorInterface
     public function getFunctions(): array
     {
         return [
-            new TwigFunction('t', [$this, 'createTranslatable']),
+            new TwigFunction('t', $this->createTranslatable(...)),
         ];
     }
 
@@ -74,7 +74,7 @@ public function getFunctions(): array
     public function getFilters(): array
     {
         return [
-            new TwigFilter('trans', [$this, 'trans']),
+            new TwigFilter('trans', $this->trans(...)),
         ];
     }
 
diff --git a/Extension/WebLinkExtension.php b/Extension/WebLinkExtension.php
@@ -37,12 +37,12 @@ public function __construct(RequestStack $requestStack)
     public function getFunctions(): array
     {
         return [
-            new TwigFunction('link', [$this, 'link']),
-            new TwigFunction('preload', [$this, 'preload']),
-            new TwigFunction('dns_prefetch', [$this, 'dnsPrefetch']),
-            new TwigFunction('preconnect', [$this, 'preconnect']),
-            new TwigFunction('prefetch', [$this, 'prefetch']),
-            new TwigFunction('prerender', [$this, 'prerender']),
+            new TwigFunction('link', $this->link(...)),
+            new TwigFunction('preload', $this->preload(...)),
+            new TwigFunction('dns_prefetch', $this->dnsPrefetch(...)),
+            new TwigFunction('preconnect', $this->preconnect(...)),
+            new TwigFunction('prefetch', $this->prefetch(...)),
+            new TwigFunction('prerender', $this->prerender(...)),
         ];
     }
 
diff --git a/Extension/WorkflowExtension.php b/Extension/WorkflowExtension.php
@@ -38,13 +38,13 @@ public function __construct(Registry $workflowRegistry)
     public function getFunctions(): array
     {
         return [
-            new TwigFunction('workflow_can', [$this, 'canTransition']),
-            new TwigFunction('workflow_transitions', [$this, 'getEnabledTransitions']),
-            new TwigFunction('workflow_transition', [$this, 'getEnabledTransition']),
-            new TwigFunction('workflow_has_marked_place', [$this, 'hasMarkedPlace']),
-            new TwigFunction('workflow_marked_places', [$this, 'getMarkedPlaces']),
-            new TwigFunction('workflow_metadata', [$this, 'getMetadata']),
-            new TwigFunction('workflow_transition_blockers', [$this, 'buildTransitionBlockerList']),
+            new TwigFunction('workflow_can', $this->canTransition(...)),
+            new TwigFunction('workflow_transitions', $this->getEnabledTransitions(...)),
+            new TwigFunction('workflow_transition', $this->getEnabledTransition(...)),
+            new TwigFunction('workflow_has_marked_place', $this->hasMarkedPlace(...)),
+            new TwigFunction('workflow_marked_places', $this->getMarkedPlaces(...)),
+            new TwigFunction('workflow_metadata', $this->getMetadata(...)),
+            new TwigFunction('workflow_transition_blockers', $this->buildTransitionBlockerList(...)),
         ];
     }
 
diff --git a/Extension/YamlExtension.php b/Extension/YamlExtension.php
@@ -28,8 +28,8 @@ final class YamlExtension extends AbstractExtension
     public function getFilters(): array
     {
         return [
-            new TwigFilter('yaml_encode', [$this, 'encode']),
-            new TwigFilter('yaml_dump', [$this, 'dump']),
+            new TwigFilter('yaml_encode', $this->encode(...)),
+            new TwigFilter('yaml_dump', $this->dump(...)),
         ];
     }
 
diff --git a/Tests/Translation/TwigExtractorTest.php b/Tests/Translation/TwigExtractorTest.php
@@ -41,7 +41,6 @@ public function testExtract($template, $messages)
         $catalogue = new MessageCatalogue('en');
 
         $m = new \ReflectionMethod($extractor, 'extractTemplate');
-        $m->setAccessible(true);
         $m->invoke($extractor, $template, $catalogue);
 
         if (0 === \count($messages)) {
diff --git a/TokenParser/StopwatchTokenParser.php b/TokenParser/StopwatchTokenParser.php
@@ -42,7 +42,7 @@ public function parse(Token $token): Node
         $stream->expect(Token::BLOCK_END_TYPE);
 
         // {% endstopwatch %}
-        $body = $this->parser->subparse([$this, 'decideStopwatchEnd'], true);
+        $body = $this->parser->subparse($this->decideStopwatchEnd(...), true);
         $stream->expect(Token::BLOCK_END_TYPE);
 
         if ($this->stopwatchIsAvailable) {
diff --git a/TokenParser/TransTokenParser.php b/TokenParser/TransTokenParser.php
@@ -69,7 +69,7 @@ public function parse(Token $token): Node
 
         // {% trans %}message{% endtrans %}
         $stream->expect(Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse([$this, 'decideTransFork'], true);
+        $body = $this->parser->subparse($this->decideTransFork(...), true);
 
         if (!$body instanceof TextNode && !$body instanceof AbstractExpression) {
             throw new SyntaxError('A message inside a trans tag must be a simple text.', $body->getTemplateLine(), $stream->getSourceContext());
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=8.0.2",
+        "php": ">=8.1",
         "symfony/translation-contracts": "^1.1|^2|^3",
         "twig/twig": "^2.13|^3.0.4"
     },

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ private function getLoaderPaths(string $name = null): array`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`foreach ($namespaces as $namespace) {`
`297`		`- $paths = array_map([$this, 'getRelativePath'], $loader->getPaths($namespace));`
	`297`	`+ $paths = array_map($this->getRelativePath(...), $loader->getPaths($namespace));`
`298`	`298`
`299`	`299`	`if (FilesystemLoader::MAIN_NAMESPACE === $namespace) {`
`300`	`300`	`$namespace = '(None)';`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function __construct(Environment $twig, HtmlErrorRenderer $fallbackErrorR`
`36`	`36`	`{`
`37`	`37`	`$this->twig = $twig;`
`38`	`38`	`$this->fallbackErrorRenderer = $fallbackErrorRenderer ?? new HtmlErrorRenderer();`
`39`		`- $this->debug = !\is_callable($debug) \|\| $debug instanceof \Closure ? $debug : \Closure::fromCallable($debug);`
	`39`	`+ $this->debug = \is_bool($debug) ? $debug : $debug(...);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ public function __construct(Packages $packages)`
`35`	`35`	`public function getFunctions(): array`
`36`	`36`	`{`
`37`	`37`	`return [`
`38`		`- new TwigFunction('asset', [$this, 'getAssetUrl']),`
`39`		`- new TwigFunction('asset_version', [$this, 'getAssetVersion']),`
	`38`	`+ new TwigFunction('asset', $this->getAssetUrl(...)),`
	`39`	`+ new TwigFunction('asset_version', $this->getAssetVersion(...)),`
`40`	`40`	`];`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function __construct(ClonerInterface $cloner, HtmlDumper $dumper = null)`
`41`	`41`	`public function getFunctions(): array`
`42`	`42`	`{`
`43`	`43`	`return [`
`44`		`- new TwigFunction('dump', [$this, 'dump'], ['is_safe' => ['html'], 'needs_context' => true, 'needs_environment' => true]),`
	`44`	`+ new TwigFunction('dump', $this->dump(...), ['is_safe' => ['html'], 'needs_context' => true, 'needs_environment' => true]),`
`45`	`45`	`];`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ final class ExpressionExtension extends AbstractExtension`
`28`	`28`	`public function getFunctions(): array`
`29`	`29`	`{`
`30`	`30`	`return [`
`31`		`- new TwigFunction('expression', [$this, 'createExpression']),`
	`31`	`+ new TwigFunction('expression', $this->createExpression(...)),`
`32`	`32`	`];`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ public function __construct(UrlHelper $urlHelper)`
`36`	`36`	`public function getFunctions(): array`
`37`	`37`	`{`
`38`	`38`	`return [`
`39`		`- new TwigFunction('absolute_url', [$this, 'generateAbsoluteUrl']),`
`40`		`- new TwigFunction('relative_path', [$this, 'generateRelativePath']),`
	`39`	`+ new TwigFunction('absolute_url', $this->generateAbsoluteUrl(...)),`
	`40`	`+ new TwigFunction('relative_path', $this->generateRelativePath(...)),`
`41`	`41`	`];`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ public function __construct(UrlGeneratorInterface $generator)`
`38`	`38`	`public function getFunctions(): array`
`39`	`39`	`{`
`40`	`40`	`return [`
`41`		`- new TwigFunction('url', [$this, 'getUrl'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),`
`42`		`- new TwigFunction('path', [$this, 'getPath'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),`
	`41`	`+ new TwigFunction('url', $this->getUrl(...), ['is_safe_callback' => $this->isUrlGenerationSafe(...)]),`
	`42`	`+ new TwigFunction('path', $this->getPath(...), ['is_safe_callback' => $this->isUrlGenerationSafe(...)]),`
`43`	`43`	`];`
`44`	`44`	`}`
`45`	`45`