[TASK] Register TCA event listener via attribute

Author: nhovratov

Classes/Generator/TcaGenerator.php

@@ -17,7 +17,6 @@
 
 namespace TYPO3\CMS\ContentBlocks\Generator;
 
-use Symfony\Component\DependencyInjection\Attribute\Autoconfigure;
 use TYPO3\CMS\ContentBlocks\Backend\Preview\PreviewRenderer;
 use TYPO3\CMS\ContentBlocks\Definition\Capability\NativeTableCapabilityProxy;
 use TYPO3\CMS\ContentBlocks\Definition\Capability\RootLevelType;
@@ -38,6 +37,7 @@
 use TYPO3\CMS\ContentBlocks\Schema\SimpleTcaSchemaFactory;
 use TYPO3\CMS\ContentBlocks\Service\SystemExtensionAvailability;
 use TYPO3\CMS\ContentBlocks\Validation\PageTypeNameValidator;
+use TYPO3\CMS\Core\Attribute\AsEventListener;
 use TYPO3\CMS\Core\Configuration\Event\BeforeTcaOverridesEvent;
 use TYPO3\CMS\Core\Domain\Repository\PageRepository;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
@@ -97,7 +97,6 @@
  *
  * @internal Not part of TYPO3's public API.
  */
-#[Autoconfigure(public: true)]
 readonly class TcaGenerator
 {
     public function __construct(
@@ -108,6 +107,7 @@ public function __construct(
         protected FlexFormGenerator $flexFormGenerator,
     ) {}
 
+    #[AsEventListener(identifier: 'content-blocks-tca')]
     public function __invoke(BeforeTcaOverridesEvent $event): void
     {
         $event->setTca(array_replace_recursive($event->getTca(), $this->generate($event->getTca())));

Classes/ServiceProvider.php

@@ -25,11 +25,9 @@
 use TYPO3\CMS\ContentBlocks\Definition\ContentType\ContentTypeInterface;
 use TYPO3\CMS\ContentBlocks\Definition\ContentType\PageTypeDefinition;
 use TYPO3\CMS\ContentBlocks\Definition\TableDefinitionCollection;
-use TYPO3\CMS\ContentBlocks\Generator\TcaGenerator;
 use TYPO3\CMS\ContentBlocks\Registry\ContentBlockRegistry;
 use TYPO3\CMS\ContentBlocks\UserFunction\ContentWhere;
 use TYPO3\CMS\ContentBlocks\Utility\ContentBlockPathUtility;
-use TYPO3\CMS\Core\Configuration\Event\BeforeTcaOverridesEvent;
 use TYPO3\CMS\Core\Core\Event\BootCompletedEvent;
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
@@ -72,7 +70,6 @@ public function getFactories(): array
             'content-blocks.hide-content-element-children' => static::hideContentElementChildren(...),
             'content-blocks.hide-content-element-children-page-content-fetching' => static::hideContentElementChildrenPageContentFetching(...),
             'content-blocks.record-summary-for-localization' => static::recordSummaryForLocalization(...),
-            'content-blocks.tca' => static::tca(...),
         ];
     }
 
@@ -278,14 +275,6 @@ public static function addUserTsConfig(ContainerInterface $container): \Closure
         };
     }
 
-    public static function tca(ContainerInterface $container): \Closure
-    {
-        return static function (BeforeTcaOverridesEvent $event) use ($container) {
-            $tcaGenerator = $container->get(TcaGenerator::class);
-            $tcaGenerator($event);
-        };
-    }
-
     public static function hideContentElementChildren(ContainerInterface $container): \Closure
     {
         return static function (ModifyDatabaseQueryForContentEvent $event) use ($container) {
@@ -411,7 +400,6 @@ public static function addEventListeners(ContainerInterface $container, Listener
         $listenerProvider->addListener(ModifyDatabaseQueryForContentEvent::class, 'content-blocks.hide-content-element-children');
         $listenerProvider->addListener(AfterContentHasBeenFetchedEvent::class, 'content-blocks.hide-content-element-children-page-content-fetching');
         $listenerProvider->addListener(AfterRecordSummaryForLocalizationEvent::class, 'content-blocks.record-summary-for-localization');
-        $listenerProvider->addListener(BeforeTcaOverridesEvent::class, 'content-blocks.tca');
         return $listenerProvider;
     }
 }