Apply rectors:

- PushRequestToRequestStackConstructorRector
- GetFunctionsToAsTwigFunctionAttributeRector
- GetFiltersToAsTwigFilterAttributeRector

Author: johanib

config/packages/test/config.yaml

@@ -6,11 +6,10 @@ services:
 
     engineblock.twig.extension.global_site_notice:
         class: OpenConext\EngineBlockBundle\Twig\Extensions\Extension\FunctionalTestingGlobalSiteNotice
+        autoconfigure: true
         arguments:
             - "@request_stack"
             - "%global.site_notice.allowed.tags%"
-        tags:
-            - { name: 'twig.extension' }
 
 web_profiler:
     toolbar: false

config/services/ci/services.yml

@@ -132,8 +132,7 @@ services:
             - '%stepup.sfo.override_engine_entityid%'
 
     OpenConext\EngineBlockBundle\Twig\Extensions\Extension\FunctionalTestingGlobalSiteNotice:
+        autoconfigure: true
         arguments:
             - "@request_stack"
             - "%global.site_notice.allowed.tags%"
-        tags:
-            - { name: 'twig.extension' }

config/services/services.yml

@@ -24,8 +24,7 @@ services:
             - { name: openconext.monitor.health_check }
 
     OpenConext\EngineBlockBundle\Twig\Extensions\Extension\Spaceless:
-        tags:
-             - { name: 'twig.extension' }
+        autoconfigure: true
 
     OpenConext\EngineBlockBundle\Value\ExecutionTime:
         factory: [ OpenConext\EngineBlockBundle\Value\ExecutionTime, 'of' ]
@@ -296,53 +295,46 @@ services:
             - '@OpenConext\EngineBlock\Metadata\MetadataRepository\CachedDoctrineMetadataRepository'
 
     OpenConext\EngineBlockBundle\Twig\Extensions\Extension\Debug:
-        tags:
-             - { name: 'twig.extension' }
+        autoconfigure: true
 
     OpenConext\EngineBlockBundle\Twig\Extensions\Extension\Feedback:
+        autoconfigure: true
         arguments:
             - '@engineblock.compat.application'
             - '@OpenConext\EngineBlockBundle\Configuration\ErrorFeedbackConfiguration'
             - '@engineblock.compat.repository.metadata'
             - '@OpenConext\EngineBlockBundle\Authentication\Service\SamlResponseHelper'
-        tags:
-             - { name: 'twig.extension' }
 
     OpenConext\EngineBlockBundle\Twig\Extensions\Extension\GlobalSiteNotice:
+        autoconfigure: true
         arguments:
             - '%global.site_notice.show%'
             - '%global.site_notice.allowed.tags%'
             - '@translator'
-        tags:
-             - { name: 'twig.extension' }
 
     OpenConext\EngineBlockBundle\Twig\Extensions\Extension\I18n:
+        autoconfigure: true
         arguments:
             - '@translator'
-        tags:
-             - { name: 'twig.extension' }
 
     OpenConext\EngineBlockBundle\Twig\Extensions\Extension\Locale:
+        autoconfigure: true
         arguments:
             - '@request_stack'
             - '@OpenConext\EngineBlockBundle\Localization\LanguageSupportProvider'
             - '%locale%'
-        tags:
-             - { name: 'twig.extension' }
 
     OpenConext\EngineBlockBundle\Twig\Extensions\Extension\Metadata:
+        autoconfigure: true
         arguments:
             - '@engineblock.compat.metadata.definitions'
             - '@translator'
-        tags:
-             - { name: 'twig.extension' }
 
     OpenConext\EngineBlockBundle\Twig\Extensions\Extension\Wayf:
+        autoconfigure: true
         arguments:
             - '@request_stack'
             - '@translator'
-        tags:
-             - { name: 'twig.extension' }
 
     OpenConext\EngineBlockBundle\Service\DiscoverySelectionService:
 

src/OpenConext/EngineBlockBundle/Twig/Extensions/Extension/Debug.php

@@ -18,27 +18,19 @@
 
 namespace OpenConext\EngineBlockBundle\Twig\Extensions\Extension;
 
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFunction;
+use Twig\Attribute\AsTwigFunction;
 
 /**
  * The debug extension is used to provide var_dump, var_export and print_r functions for usage in Twig templates.
  */
-class Debug extends AbstractExtension
+class Debug
 {
-    public function getFunctions(): array
-    {
-        return [
-            new TwigFunction('var_export', $this->varExport(...)),
-            new TwigFunction('print_r', $this->printHumanReadable(...)),
-        ];
-    }
-
     /**
      * Provide var export functionality for use in Twig templates
      * @param mixed $expression
      * @return string
      */
+    #[AsTwigFunction(name: 'var_export')]
     public function varExport($expression)
     {
         return var_export($expression, true);
@@ -49,6 +41,7 @@ public function varExport($expression)
      * @param mixed $expression
      * @return string
      */
+    #[AsTwigFunction(name: 'print_r')]
     public function printHumanReadable($expression)
     {
         return print_r($expression, true);

src/OpenConext/EngineBlockBundle/Twig/Extensions/Extension/Feedback.php

@@ -26,10 +26,9 @@
 use OpenConext\EngineBlockBundle\Value\FeedbackInformation;
 use OpenConext\EngineBlockBundle\Value\FeedbackInformationMap;
 use SAML2\XML\saml\Issuer;
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFunction;
+use Twig\Attribute\AsTwigFunction;
 
-class Feedback extends AbstractExtension
+class Feedback
 {
     /**
      * @var EngineBlock_ApplicationSingleton
@@ -63,23 +62,7 @@ public function __construct(
         $this->samlResponseHelper = $samlResponseHelper;
     }
 
-    public function getFunctions(): array
-    {
-        return [
-            new TwigFunction('feedbackInfo', $this->getFeedbackInfo(...)),
-            new TwigFunction('flushLog', $this->flushLog(...)),
-            new TwigFunction('hasBackToSpLink', $this->hasBackToSpLink(...)),
-            new TwigFunction('hasWikiLink', $this->hasWikiLink(...)),
-            new TwigFunction('getWikiLink', $this->getWikiLink(...)),
-            new TwigFunction('hasIdPContactMailLink', $this->hasIdPContactMailLink(...)),
-            new TwigFunction('getIdPContactMailLink', $this->getIdPContactMailLink(...)),
-            new TwigFunction('getIdpContactShortLabel', $this->getIdpContactShortLabel(...)),
-            new TwigFunction('getSpName', $this->getSpName(...)),
-            new TwigFunction('getAcu', $this->getAcu(...)),
-            new TwigFunction('getSamlFailedResponse', $this->getSamlFailedResponse(...)),
-        ];
-    }
-
+    #[AsTwigFunction(name: 'flushLog')]
     public function flushLog($message)
     {
         // For now use the EngineBlock_ApplicationSingleton to flush the log
@@ -89,6 +72,7 @@ public function flushLog($message)
     /**
      * @return FeedbackInformationMap
      */
+    #[AsTwigFunction(name: 'feedbackInfo')]
     public function getFeedbackInfo()
     {
         return $this->retrieveFeedbackInfo();
@@ -98,6 +82,7 @@ public function getFeedbackInfo()
      * @param string $templateName
      * @return bool
      */
+    #[AsTwigFunction(name: 'hasWikiLink')]
     public function hasWikiLink($templateName)
     {
         return $this->errorFeedbackConfiguration->hasWikiLink($templateName);
@@ -107,6 +92,7 @@ public function hasWikiLink($templateName)
      * @param string $templateName
      * @return string
      */
+    #[AsTwigFunction(name: 'getWikiLink')]
     public function getWikiLink($templateName)
     {
         return $this->errorFeedbackConfiguration->getWikiLink($templateName);
@@ -116,6 +102,7 @@ public function getWikiLink($templateName)
      * @param string $templateName
      * @return bool
      */
+    #[AsTwigFunction(name: 'hasIdPContactMailLink')]
     public function hasIdPContactMailLink($templateName)
     {
         return $this->errorFeedbackConfiguration->isIdPContactPage($templateName) && $this->getIdPContactMailLink();
@@ -125,6 +112,7 @@ public function hasIdPContactMailLink($templateName)
      * @param string $templateName
      * @return string
      */
+    #[AsTwigFunction(name: 'getIdpContactShortLabel')]
     public function getIdpContactShortLabel($templateName)
     {
         return $this->errorFeedbackConfiguration->getIdpContactShortLabel($templateName);
@@ -133,6 +121,7 @@ public function getIdpContactShortLabel($templateName)
     /**
      * @return string
      */
+    #[AsTwigFunction(name: 'getIdPContactMailLink')]
     public function getIdPContactMailLink()
     {
         $feedbackInfo = $this->retrieveFeedbackInfo();
@@ -153,6 +142,7 @@ public function getIdPContactMailLink()
         return '';
     }
 
+    #[AsTwigFunction(name: 'hasBackToSpLink')]
     public function hasBackToSpLink(): bool
     {
         $info = $this->retrieveFeedbackInfo();
@@ -165,17 +155,20 @@ public function hasBackToSpLink(): bool
         return $response !== '';
     }
 
+    #[AsTwigFunction(name: 'getSpName')]
     public function getSpName(): ?string
     {
         return $this->getFeedbackInfo()->get('serviceProviderName') ?? $this->getFeedbackInfo()->get('serviceProvider');
     }
 
+    #[AsTwigFunction(name: 'getAcu')]
     public function getAcu(): string
     {
         $info = $this->retrieveFeedbackInfo();
         return $this->samlResponseHelper->getAcu($info->get('serviceProvider'));
     }
 
+    #[AsTwigFunction(name: 'getSamlFailedResponse')]
     public function getSamlFailedResponse(): string
     {
         $session = $this->application->getSession();

src/OpenConext/EngineBlockBundle/Twig/Extensions/Extension/FunctionalTestingGlobalSiteNotice.php

@@ -19,10 +19,9 @@
 namespace OpenConext\EngineBlockBundle\Twig\Extensions\Extension;
 
 use Symfony\Component\HttpFoundation\RequestStack;
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFunction;
+use Twig\Attribute\AsTwigFunction;
 
-class FunctionalTestingGlobalSiteNotice extends AbstractExtension implements GlobalSiteNoticeInterface
+class FunctionalTestingGlobalSiteNotice implements GlobalSiteNoticeInterface
 {
     private $request;
 
@@ -39,20 +38,13 @@ public function __construct(
         $this->allowedHtml = $allowedHtml;
     }
 
-    public function getFunctions(): array
-    {
-        return [
-            new TwigFunction('shouldDisplayGlobalSiteNotice', $this->shouldDisplayGlobalSiteNotice(...)),
-            new TwigFunction('getGlobalSiteNotice', $this->getGlobalSiteNotice(...)),
-            new TwigFunction('getAllowedHtmlForNotice', $this->getAllowedHtmlForNotice(...)),
-        ];
-    }
-
+    #[AsTwigFunction(name: 'shouldDisplayGlobalSiteNotice')]
     public function shouldDisplayGlobalSiteNotice() : bool
     {
         return (bool) $this->request->get('showGlobalSiteNotice', false);
     }
 
+    #[AsTwigFunction(name: 'getGlobalSiteNotice')]
     public function getGlobalSiteNotice(): string
     {
         $message = <<<MSG
@@ -73,6 +65,7 @@ public function getGlobalSiteNotice(): string
         return (string) $this->request->get('globalSiteNotice', $message);
     }
 
+    #[AsTwigFunction(name: 'getAllowedHtmlForNotice')]
     public function getAllowedHtmlForNotice(): string
     {
         return $this->allowedHtml;

src/OpenConext/EngineBlockBundle/Twig/Extensions/Extension/GlobalSiteNotice.php

@@ -19,10 +19,9 @@
 namespace OpenConext\EngineBlockBundle\Twig\Extensions\Extension;
 
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFunction;
+use Twig\Attribute\AsTwigFunction;
 
-class GlobalSiteNotice extends AbstractExtension
+class GlobalSiteNotice
 {
     /**
      * @var bool
@@ -49,25 +48,19 @@ public function __construct(
         $this->translator = $translator;
     }
 
-    public function getFunctions(): array
-    {
-        return [
-            new TwigFunction('shouldDisplayGlobalSiteNotice', $this->shouldDisplayGlobalSiteNotice(...)),
-            new TwigFunction('getGlobalSiteNotice', $this->getGlobalSiteNotice(...)),
-            new TwigFunction('getAllowedHtmlForNotice', $this->getAllowedHtmlForNotice(...)),
-        ];
-    }
-
+    #[AsTwigFunction(name: 'shouldDisplayGlobalSiteNotice')]
     public function shouldDisplayGlobalSiteNotice() : bool
     {
         return $this->shouldDisplayGlobalSiteNotice;
     }
 
+    #[AsTwigFunction(name: 'getGlobalSiteNotice')]
     public function getGlobalSiteNotice(): string
     {
         return $this->translator->trans('site_notice');
     }
 
+    #[AsTwigFunction(name: 'getAllowedHtmlForNotice')]
     public function getAllowedHtmlForNotice(): string
     {
         return $this->allowedHtml;

src/OpenConext/EngineBlockBundle/Twig/Extensions/Extension/I18n.php

@@ -19,10 +19,9 @@
 namespace OpenConext\EngineBlockBundle\Twig\Extensions\Extension;
 
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
+use Twig\Attribute\AsTwigFilter;
 
-class I18n extends AbstractExtension
+class I18n
 {
     /**
      * @var TranslatorInterface
@@ -34,20 +33,14 @@ public function __construct(TranslatorInterface $translator)
         $this->translator = $translator;
     }
 
-    public function getFilters()
-    {
-        return [
-            new TwigFilter('trans', $this->translateSingular(...)),
-            new TwigFilter('transchoice', $this->translatePlural(...)),
-        ];
-    }
-
+    #[AsTwigFilter(name: 'trans')]
     public function translateSingular($id, array $parameters = [], $domain = null, $locale = null)
     {
         $parameters = $this->addDefaultPlaceholders($parameters);
         return $this->translator->trans($id, $parameters, $domain, $locale);
     }
 
+    #[AsTwigFilter(name: 'transchoice')]
     public function translatePlural($id, $count, array $parameters = [], $domain = null, $locale = null)
     {
         $parameters = $this->addDefaultPlaceholders($parameters);