[TASK] Autowire ContentWhere with attribute

Author: nhovratov

Classes/ServiceProvider.php

@@ -26,7 +26,6 @@
 use TYPO3\CMS\ContentBlocks\Definition\ContentType\PageTypeDefinition;
 use TYPO3\CMS\ContentBlocks\Definition\TableDefinitionCollection;
 use TYPO3\CMS\ContentBlocks\Registry\ContentBlockRegistry;
-use TYPO3\CMS\ContentBlocks\UserFunction\ContentWhere;
 use TYPO3\CMS\ContentBlocks\Utility\ContentBlockPathUtility;
 use TYPO3\CMS\Core\Core\Event\BootCompletedEvent;
 use TYPO3\CMS\Core\Database\Connection;
@@ -58,7 +57,6 @@ protected static function getPackageName(): string
     public function getFactories(): array
     {
         return [
-            ContentWhere::class => static::getContentWhere(...),
             'content-blocks.icons' => static::getContentBlockIcons(...),
             'content-blocks.page-types' => static::getContentBlockPageTypes(...),
             'content-blocks.typoscript' => static::getContentBlockTypoScript(...),
@@ -79,19 +77,6 @@ public function getExtensions(): array
         ] + parent::getExtensions();
     }
 
-    public static function getContentWhere(ContainerInterface $container): ContentWhere
-    {
-        $arrayObject = $container->get('content-blocks.parent-field-names');
-        $parentFieldNames = $arrayObject->getArrayCopy();
-        return self::new(
-            $container,
-            ContentWhere::class,
-            [
-                $parentFieldNames,
-            ]
-        );
-    }
-
     public static function getContentBlockIcons(ContainerInterface $container): \ArrayObject
     {
         $arrayObject = new \ArrayObject();
@@ -200,16 +185,15 @@ public static function getContentBlockTypoScript(ContainerInterface $container):
         return $arrayObject;
     }
 
-    public static function getContentBlockParentFieldNames(ContainerInterface $container): \ArrayObject
+    public static function getContentBlockParentFieldNames(ContainerInterface $container): array
     {
-        $arrayObject = new \ArrayObject();
         $cache = $container->get('cache.core');
         $typoScriptFromCache = $cache->require('ContentBlocks_ParentFieldNames');
         if ($typoScriptFromCache !== false) {
-            $arrayObject->exchangeArray($typoScriptFromCache);
-            return $arrayObject;
+            return $typoScriptFromCache;
         }
 
+        $arrayObject = [];
         /** @var TableDefinitionCollection $tableDefinitionCollection */
         $tableDefinitionCollection = $container->get(TableDefinitionCollection::class);
         $contentElementTable = ContentType::CONTENT_ELEMENT->getTable();
@@ -223,9 +207,9 @@ public static function getContentBlockParentFieldNames(ContainerInterface $conta
                     $fieldNames[$foreignField] = $foreignField;
                 }
             }
-            $arrayObject->exchangeArray(array_values($fieldNames));
+            $arrayObject = array_values($fieldNames);
         }
-        $cache->set('ContentBlocks_ParentFieldNames', 'return ' . var_export($arrayObject->getArrayCopy(), true) . ';');
+        $cache->set('ContentBlocks_ParentFieldNames', 'return ' . var_export($arrayObject, true) . ';');
         return $arrayObject;
     }
 
@@ -241,8 +225,7 @@ public static function addTypoScript(ContainerInterface $container): \Closure
     public static function hideContentElementChildren(ContainerInterface $container): \Closure
     {
         return static function (ModifyDatabaseQueryForContentEvent $event) use ($container) {
-            $arrayObject = $container->get('content-blocks.parent-field-names');
-            $parentFieldNames = $arrayObject->getArrayCopy();
+            $parentFieldNames = $container->get('content-blocks.parent-field-names');
             $queryBuilder = $event->getQueryBuilder();
             foreach ($parentFieldNames as $fieldName) {
                 $queryBuilder->andWhere(
@@ -284,8 +267,7 @@ public static function recordSummaryForLocalization(ContainerInterface $containe
     {
         return static function (AfterRecordSummaryForLocalizationEvent $event) use ($container) {
             $recordsPerColumn = $event->getRecords();
-            $arrayObject = $container->get('content-blocks.parent-field-names');
-            $parentFieldNames = $arrayObject->getArrayCopy();
+            $parentFieldNames = $container->get('content-blocks.parent-field-names');
             $allUids = [];
             foreach ($recordsPerColumn as $records) {
                 foreach ($records as $record) {
@@ -361,7 +343,6 @@ public static function addEventListeners(ContainerInterface $container, Listener
         $listenerProvider->addListener(BootCompletedEvent::class, 'content-blocks.add-typoscript');
         $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');
         return $listenerProvider;
     }
 }

Classes/UserFunction/ContentWhere.php

@@ -18,6 +18,7 @@
 namespace TYPO3\CMS\ContentBlocks\UserFunction;
 
 use Symfony\Component\DependencyInjection\Attribute\Autoconfigure;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use TYPO3\CMS\Core\Attribute\AsAllowedCallable;
 
 /**
@@ -27,6 +28,7 @@
 readonly class ContentWhere
 {
     public function __construct(
+        #[Autowire(service: 'content-blocks.parent-field-names')]
         protected array $parentFieldNames
     ) {}