TASK: Reformat NodeEnumerator code

Author: Sebobo

Classes/NodeEnumeration/NodeEnumerator.php

@@ -14,6 +14,7 @@
 use Flowpack\DecoupledContentStore\PrepareContentRelease\Infrastructure\RedisContentReleaseService;
 use Flowpack\DecoupledContentStore\Utility\GeneratorUtility;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\Eel\Exception;
 use Neos\Eel\FlowQuery\FlowQuery;
 use Neos\Flow\Annotations as Flow;
 use Neos\Neos\Domain\Model\Site;
@@ -43,19 +44,34 @@ class NodeEnumerator
      * @Flow\InjectConfiguration("nodeRendering.nodeTypeWhitelist")
      * @var string
      */
-    protected $nodeTypeWhitelist;
-
-    public function enumerateAndStoreInRedis(?Site $site, ContentReleaseLogger $contentReleaseLogger, ContentReleaseIdentifier $releaseIdentifier): void
-    {
-        $contentReleaseLogger->info('Starting content release', ['contentReleaseIdentifier' => $releaseIdentifier->jsonSerialize()]);
+    protected $nodeTypeList;
+
+    public function enumerateAndStoreInRedis(
+        ?Site $site,
+        ContentReleaseLogger $contentReleaseLogger,
+        ContentReleaseIdentifier $releaseIdentifier
+    ): void {
+        $contentReleaseLogger->info(
+            'Starting content release',
+            ['contentReleaseIdentifier' => $releaseIdentifier->jsonSerialize()]
+        );
 
         // set content release status to running
         $currentMetadata = $this->redisContentReleaseService->fetchMetadataForContentRelease($releaseIdentifier);
         $newMetadata = $currentMetadata->withStatus(NodeRenderingCompletionStatus::running());
-        $this->redisContentReleaseService->setContentReleaseMetadata($releaseIdentifier, $newMetadata, RedisInstanceIdentifier::primary());
+        $this->redisContentReleaseService->setContentReleaseMetadata(
+            $releaseIdentifier,
+            $newMetadata,
+            RedisInstanceIdentifier::primary()
+        );
 
         $this->redisEnumerationRepository->clearDocumentNodesEnumeration($releaseIdentifier);
-        foreach (GeneratorUtility::createArrayBatch($this->enumerateAll($site, $contentReleaseLogger, $newMetadata->getWorkspaceName()), 100) as $enumeration) {
+        foreach (
+            GeneratorUtility::createArrayBatch(
+                $this->enumerateAll($site, $contentReleaseLogger, $newMetadata->getWorkspaceName()),
+                100
+            ) as $enumeration
+        ) {
             $this->concurrentBuildLockService->assertNoOtherContentReleaseWasStarted($releaseIdentifier);
             // $enumeration is an array of EnumeratedNode, with at most 100 elements in it.
             // TODO: EXTENSION POINT HERE, TO ADD ADDITIONAL ENUMERATIONS (.metadata.json f.e.)
@@ -66,21 +82,33 @@ public function enumerateAndStoreInRedis(?Site $site, ContentReleaseLogger $cont
 
     /**
      * @return iterable<EnumeratedNode>
+     * @throws Exception
      */
-    private function enumerateAll(?Site $site, ContentReleaseLogger $contentReleaseLogger, string $workspaceName): iterable
-    {
+    private function enumerateAll(
+        ?Site $site,
+        ContentReleaseLogger $contentReleaseLogger,
+        string $workspaceName
+    ): iterable {
         $combinator = new NodeContextCombinator();
 
-        // Build filter from white listed nodetypes
-        $nodeTypeWhitelist = explode(',', $this->nodeTypeWhitelist ?: 'Neos.Neos:Document');
-        $nodeTypeFilter = implode(',', array_map(static function ($nodeType) {
-            if ($nodeType[0] === '!') {
-                return '[!instanceof ' . substr($nodeType, 1) . ']';
-            }
-            return '[instanceof ' . $nodeType . ']';
-        }, $nodeTypeWhitelist));
-
-        $queueSite = static function (Site $site) use ($combinator, $nodeTypeFilter, $contentReleaseLogger, $workspaceName) {
+        // Build filter from allowed/disallowed nodetypes
+        $nodeTypeList = explode(',', $this->nodeTypeList ?: 'Neos.Neos:Document');
+        $nodeTypeFilter = implode(
+            ',',
+            array_map(static function ($nodeType) {
+                if ($nodeType[0] === '!') {
+                    return '[!instanceof ' . substr($nodeType, 1) . ']';
+                }
+                return '[instanceof ' . $nodeType . ']';
+            }, $nodeTypeList)
+        );
+
+        $queueSite = static function (Site $site) use (
+            $combinator,
+            $nodeTypeFilter,
+            $contentReleaseLogger,
+            $workspaceName
+        ) {
             $contentReleaseLogger->debug('Publishing site', [
                 'name' => $site->getName(),
                 'domain' => $site->getFirstActiveDomain()
@@ -125,7 +153,9 @@ private function enumerateAll(?Site $site, ContentReleaseLogger $contentReleaseL
                     }
                 }
             }
-            $contentReleaseLogger->debug(sprintf('Finished enumerating site %s in %dms', $site->getName(), (microtime(true) - $startTime) * 1000));
+            $contentReleaseLogger->debug(
+                sprintf('Finished enumerating site %s in %dms', $site->getName(), (microtime(true) - $startTime) * 1000)
+            );
         };
 
         if ($site === null) {