[FEATURE] Introduce #[AsHelper] attribute for helper DI registration

Classes/Attribute/AsHelper.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the TYPO3 CMS extension "handlebars".
+ *
+ * Copyright (C) 2024 Elias Häußler <e.haeussler@familie-redlich.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace Fr\Typo3Handlebars\Attribute;
+
+/**
+ * AsHelper
+ *
+ * @author Elias Häußler <e.haeussler@familie-redlich.de>
+ * @license GPL-2.0-or-later
+ */
+#[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD)]
+final readonly class AsHelper
+{
+    public const TAG_NAME = 'handlebars.helper';
+
+    public function __construct(
+        public string $identifier,
+        public ?string $method = null,
+    ) {}
+}

Classes/Cache/HandlebarsCache.php

@@ -23,6 +23,8 @@
 
 namespace Fr\Typo3Handlebars\Cache;
 
+use Symfony\Component\DependencyInjection\Attribute\AsAlias;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
 
 /**
@@ -31,9 +33,11 @@
  * @author Elias Häußler <e.haeussler@familie-redlich.de>
  * @license GPL-2.0-or-later
  */
+#[AsAlias('handlebars.cache')]
 class HandlebarsCache implements CacheInterface
 {
     public function __construct(
+        #[Autowire('@cache.handlebars')]
         protected readonly FrontendInterface $cache,
     ) {}
 

Classes/Compatibility/View/HandlebarsViewResolver.php

@@ -25,6 +25,7 @@
 
 use Fr\Typo3Handlebars\DataProcessing\DataProcessorInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autoconfigure;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\View\GenericViewResolver;
 use TYPO3Fluid\Fluid\View\ViewInterface;
@@ -35,6 +36,7 @@
  * @author Elias Häußler <e.haeussler@familie-redlich.de>
  * @license GPL-2.0-or-later
  */
+#[Autoconfigure(public: true)]
 class HandlebarsViewResolver extends GenericViewResolver
 {
     /**

Classes/DataProcessing/SimpleProcessor.php

@@ -27,6 +27,7 @@
 use Fr\Typo3Handlebars\Renderer\RendererInterface;
 use Fr\Typo3Handlebars\Traits\ErrorHandlingTrait;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autoconfigure;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 
 /**
@@ -35,6 +36,7 @@
  * @author Elias Häußler <e.haeussler@familie-redlich.de>
  * @license GPL-2.0-or-later
  */
+#[Autoconfigure(public: true)]
 class SimpleProcessor implements DataProcessorInterface
 {
     use ErrorHandlingTrait;

Classes/Renderer/HandlebarsRenderer.php

@@ -38,6 +38,9 @@
 use LightnCandy\Runtime;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\Attribute\AsAlias;
+use Symfony\Component\DependencyInjection\Attribute\Autoconfigure;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
@@ -47,6 +50,8 @@
  * @author Elias Häußler <e.haeussler@familie-redlich.de>
  * @license GPL-2.0-or-later
  */
+#[AsAlias('handlebars.renderer')]
+#[Autoconfigure(tags: ['handlebars.renderer'])]
 class HandlebarsRenderer implements RendererInterface, HelperAwareInterface
 {
     use HandlebarsHelperTrait;
@@ -57,11 +62,15 @@ class HandlebarsRenderer implements RendererInterface, HelperAwareInterface
      * @param array<string|int, mixed> $defaultData
      */
     public function __construct(
+        #[Autowire('@handlebars.cache')]
         protected readonly CacheInterface $cache,
         protected readonly EventDispatcherInterface $eventDispatcher,
         protected readonly LoggerInterface $logger,
+        #[Autowire('@handlebars.template_resolver')]
         protected readonly TemplateResolverInterface $templateResolver,
+        #[Autowire('@handlebars.partial_resolver')]
         protected readonly ?TemplateResolverInterface $partialResolver = null,
+        #[Autowire('%handlebars.default_data%')]
         protected array $defaultData = [],
     ) {
         $this->debugMode = $this->isDebugModeEnabled();

Classes/Renderer/Helper/BlockHelper.php

@@ -23,6 +23,7 @@
 
 namespace Fr\Typo3Handlebars\Renderer\Helper;
 
+use Fr\Typo3Handlebars\Attribute;
 use Fr\Typo3Handlebars\Exception;
 use Fr\Typo3Handlebars\Renderer;
 
@@ -33,12 +34,13 @@
  * @license GPL-2.0-or-later
  * @see https://github.com/shannonmoeller/handlebars-layouts#block-name
  */
-class BlockHelper implements HelperInterface
+final readonly class BlockHelper implements HelperInterface
 {
     /**
      * @param array<string, mixed> $options
      * @throws Exception\UnsupportedTypeException
      */
+    #[Attribute\AsHelper('block')]
     public function evaluate(string $name, array $options): string
     {
         $data = $options['_this'];

Classes/Renderer/Helper/ContentHelper.php

@@ -23,6 +23,7 @@
 
 namespace Fr\Typo3Handlebars\Renderer\Helper;
 
+use Fr\Typo3Handlebars\Attribute;
 use Fr\Typo3Handlebars\Renderer;
 use Psr\Log;
 
@@ -33,16 +34,17 @@
  * @license GPL-2.0-or-later
  * @see https://github.com/shannonmoeller/handlebars-layouts#content-name-modeappendprependreplace
  */
-class ContentHelper implements HelperInterface
+final readonly class ContentHelper implements HelperInterface
 {
     public function __construct(
-        protected readonly Log\LoggerInterface $logger,
+        private Log\LoggerInterface $logger,
     ) {}
 
     /**
      * @param array<string, mixed> $options
      * @return string|bool
      */
+    #[Attribute\AsHelper('content')]
     public function evaluate(string $name, array $options)
     {
         $data = $options['_this'];

Classes/Renderer/Helper/ExtendHelper.php

@@ -23,6 +23,7 @@
 
 namespace Fr\Typo3Handlebars\Renderer\Helper;
 
+use Fr\Typo3Handlebars\Attribute;
 use Fr\Typo3Handlebars\Renderer;
 
 /**
@@ -32,12 +33,13 @@
  * @license GPL-2.0-or-later
  * @see https://github.com/shannonmoeller/handlebars-layouts#extend-partial-context-keyvalue-
  */
-class ExtendHelper implements HelperInterface
+final readonly class ExtendHelper implements HelperInterface
 {
     public function __construct(
-        protected readonly Renderer\RendererInterface $renderer,
+        private Renderer\RendererInterface $renderer,
     ) {}
 
+    #[Attribute\AsHelper('extend')]
     public function evaluate(string $name): string
     {
         // Get helper options

Classes/Renderer/Helper/RenderHelper.php

@@ -23,6 +23,7 @@
 
 namespace Fr\Typo3Handlebars\Renderer\Helper;
 
+use Fr\Typo3Handlebars\Attribute;
 use Fr\Typo3Handlebars\DataProcessing;
 use Fr\Typo3Handlebars\Exception;
 use Fr\Typo3Handlebars\Renderer;
@@ -37,17 +38,18 @@
  * @license GPL-2.0-or-later
  * @see https://github.com/frctl/fractal/blob/main/packages/handlebars/src/helpers/render.js
  */
-class RenderHelper implements HelperInterface
+final readonly class RenderHelper implements HelperInterface
 {
     public function __construct(
-        protected readonly Renderer\RendererInterface $renderer,
-        protected readonly Core\TypoScript\TypoScriptService $typoScriptService,
-        protected readonly Frontend\ContentObject\ContentObjectRenderer $contentObjectRenderer,
+        private Renderer\RendererInterface $renderer,
+        private Core\TypoScript\TypoScriptService $typoScriptService,
+        private Frontend\ContentObject\ContentObjectRenderer $contentObjectRenderer,
     ) {}
 
     /**
      * @throws Exception\InvalidConfigurationException
      */
+    #[Attribute\AsHelper('render')]
     public function evaluate(string $name): SafeString
     {
         // Get helper options

Classes/Renderer/Helper/VarDumpHelper.php

@@ -23,24 +23,26 @@
 
 namespace Fr\Typo3Handlebars\Renderer\Helper;
 
-use TYPO3\CMS\Core\Utility\DebugUtility;
+use Fr\Typo3Handlebars\Attribute;
+use TYPO3\CMS\Core;
 
 /**
  * VarDumpHelper
  *
  * @author Elias Häußler <e.haeussler@familie-redlich.de>
  * @license GPL-2.0-or-later
  */
-class VarDumpHelper implements HelperInterface
+final readonly class VarDumpHelper implements HelperInterface
 {
     /**
      * @param array<string|int, mixed> $context
      */
+    #[Attribute\AsHelper('varDump')]
     public static function evaluate(array $context): string
     {
         \ob_start();
 
-        DebugUtility::debug($context['_this']);
+        Core\Utility\DebugUtility::debug($context['_this']);
 
         return (string)\ob_get_clean();
     }

Classes/Renderer/Template/TemplatePaths.php

@@ -24,6 +24,7 @@
 namespace Fr\Typo3Handlebars\Renderer\Template;
 
 use Fr\Typo3Handlebars\Configuration\Extension;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 
@@ -51,6 +52,10 @@ class TemplatePaths
      */
     public function __construct(
         protected readonly ConfigurationManagerInterface $configurationManager,
+        #[Autowire([
+            self::TEMPLATES => '%handlebars.template_root_paths%',
+            self::PARTIALS => '%handlebars.partial_root_paths%',
+        ])]
         protected readonly array $viewConfiguration = [],
         protected readonly string $type = self::TEMPLATES,
     ) {}

Configuration/Services.php

@@ -23,13 +23,28 @@
 
 namespace Fr\Typo3Handlebars\DependencyInjection;
 
+use Fr\Typo3Handlebars\Attribute\AsHelper;
 use Fr\Typo3Handlebars\DependencyInjection\Extension\HandlebarsExtension;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator, ContainerBuilder $container): void {
     $container->registerExtension(new HandlebarsExtension());
     $container->addCompilerPass(new DataProcessorPass('handlebars.processor', 'handlebars.compatibility_layer'));
-    $container->addCompilerPass(new HandlebarsHelperPass('handlebars.helper', 'handlebars.renderer'));
+    $container->addCompilerPass(new HandlebarsHelperPass(AsHelper::TAG_NAME, 'handlebars.renderer'));
     $container->addCompilerPass(new FeatureRegistrationPass(), priority: 30);
+
+    $container->registerAttributeForAutoconfiguration(
+        AsHelper::class,
+        static function (ChildDefinition $definition, AsHelper $attribute, \Reflector $reflector): void {
+            $definition->addTag(
+                AsHelper::TAG_NAME,
+                [
+                    'identifier' => $attribute->identifier,
+                    'method' => $attribute->method ?? ($reflector instanceof \ReflectionMethod ? $reflector->getName() : '__invoke'),
+                ],
+            );
+        },
+    );
 };

Configuration/Services.yaml

@@ -9,18 +9,12 @@ services:
     exclude:
       - '../Classes/DependencyInjection/*'
 
-  # Renderer
-  handlebars.renderer:
-    class: 'Fr\Typo3Handlebars\Renderer\HandlebarsRenderer'
-    arguments:
-      $templateResolver: '@handlebars.template_resolver'
-      $partialResolver: '@handlebars.partial_resolver'
-      $cache: '@handlebars.cache'
-      $defaultData: '%handlebars.default_data%'
-    tags: ['handlebars.renderer']
-
+  Fr\Typo3Handlebars\Cache\CacheInterface:
+    alias: 'handlebars.cache'
   Fr\Typo3Handlebars\Renderer\RendererInterface:
     alias: 'handlebars.renderer'
+  Fr\Typo3Handlebars\Renderer\Template\TemplateResolverInterface:
+    alias: 'handlebars.template_resolver'
 
   # Template
   handlebars.template_resolver:
@@ -33,15 +27,8 @@ services:
     arguments:
       $templateRootPaths: '@handlebars.template_paths.partial_root_paths'
 
-  Fr\Typo3Handlebars\Renderer\Template\TemplateResolverInterface:
-    alias: 'handlebars.template_resolver'
-
   handlebars.template_paths:
     class: 'Fr\Typo3Handlebars\Renderer\Template\TemplatePaths'
-    arguments:
-      $viewConfiguration:
-        template_root_paths: '%handlebars.template_root_paths%'
-        partial_root_paths: '%handlebars.partial_root_paths%'
   handlebars.template_paths.template_root_paths:
     parent: 'handlebars.template_paths'
     arguments:
@@ -51,35 +38,12 @@ services:
     arguments:
       $type: 'partial_root_paths'
 
-  # Data processor
-  Fr\Typo3Handlebars\DataProcessing\SimpleProcessor:
-    public: true
-
-  # Handlebars Helper
-  Fr\Typo3Handlebars\Renderer\Helper\VarDumpHelper:
-    tags:
-      - name: handlebars.helper
-        identifier: 'varDump'
-        method: 'evaluate'
-
   # Cache
-  handlebars.cache:
-    class: 'Fr\Typo3Handlebars\Cache\HandlebarsCache'
-    arguments:
-      $cache: '@cache.handlebars'
-
-  Fr\Typo3Handlebars\Cache\CacheInterface:
-    alias: 'handlebars.cache'
-
   cache.handlebars:
     class: TYPO3\CMS\Core\Cache\Frontend\FrontendInterface
     factory: ['@TYPO3\CMS\Core\Cache\CacheManager', 'getCache']
     arguments: ['handlebars']
 
-  # Compatibility
-  Fr\Typo3Handlebars\Compatibility\View\HandlebarsViewResolver:
-    public: true
-
 handlebars:
   default_data: []
   template: