[TASK] Extract AssetPublisher

Author: nhovratov

Classes/Loader/AssetPublisher.php

@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+namespace TYPO3\CMS\ContentBlocks\Loader;
+
+use Symfony\Component\Filesystem\Exception\IOException;
+use Symfony\Component\Filesystem\Filesystem;
+use TYPO3\CMS\ContentBlocks\Utility\ContentBlockPathUtility;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
+class AssetPublisher
+{
+    /**
+     * @param LoadedContentBlock[] $loadedContentBlocks
+     */
+    public function publishAssets(array $loadedContentBlocks): void
+    {
+        $fileSystem = new Filesystem();
+        foreach ($loadedContentBlocks as $loadedContentBlock) {
+            $hostExtension = $loadedContentBlock->getHostExtension();
+            $contentBlockExtPublicPath = $loadedContentBlock->getExtPath() . '/' . ContentBlockPathUtility::getAssetsFolder();
+            $contentBlockAbsolutePublicPath = GeneralUtility::getFileAbsFileName($contentBlockExtPublicPath);
+            // If the Content Block does not have an Assets folder, nothing to publish here.
+            if (!file_exists($contentBlockAbsolutePublicPath)) {
+                continue;
+            }
+            $hostAbsolutePublicContentBlockBasePath = ContentBlockPathUtility::getHostAbsolutePublicContentBlockBasePath($hostExtension);
+            // Prevent symlinks from being added to git index.
+            $gitIgnorePath = $hostAbsolutePublicContentBlockBasePath . '/.gitignore';
+            if (!file_exists($gitIgnorePath)) {
+                GeneralUtility::mkdir_deep($hostAbsolutePublicContentBlockBasePath);
+                file_put_contents($gitIgnorePath, '*');
+            }
+            $hostAbsolutePublicContentBlockBasePathWithVendor = $hostAbsolutePublicContentBlockBasePath . '/' . $loadedContentBlock->getVendor();
+            $contentBlockRelativePublicPath = $fileSystem->makePathRelative(
+                $contentBlockAbsolutePublicPath,
+                $hostAbsolutePublicContentBlockBasePathWithVendor
+            );
+            $hostAbsolutePublicContentBlockPath = ContentBlockPathUtility::getHostAbsolutePublicContentBlockPath(
+                $hostExtension,
+                $loadedContentBlock->getName(),
+            );
+            try {
+                $fileSystem->symlink($contentBlockRelativePublicPath, $hostAbsolutePublicContentBlockPath);
+            } catch (IOException) {
+                $fileSystem->mirror($contentBlockAbsolutePublicPath, $hostAbsolutePublicContentBlockPath);
+            }
+        }
+    }
+}

Classes/Loader/ContentBlockLoader.php

@@ -18,8 +18,6 @@
 namespace TYPO3\CMS\ContentBlocks\Loader;
 
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
-use Symfony\Component\Filesystem\Exception\IOException;
-use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Yaml\Yaml;
 use TYPO3\CMS\ContentBlocks\Basics\BasicsLoader;
@@ -37,7 +35,6 @@
 use TYPO3\CMS\Core\Cache\Frontend\PhpFrontend;
 use TYPO3\CMS\Core\Package\PackageManager;
 use TYPO3\CMS\Core\Resource\FileType;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * Main bootstrap loader for Content Blocks. This class finds registered
@@ -79,6 +76,7 @@ public function __construct(
         protected readonly BasicsLoader $basicsLoader,
         protected readonly PackageManager $packageManager,
         protected readonly IconProcessor $iconProcessor,
+        protected readonly AssetPublisher $assetPublisher,
     ) {}
 
     public function load(): ContentBlockRegistry
@@ -123,7 +121,7 @@ public function loadUncached(): ContentBlockRegistry
         usort($loadedContentBlocks, $sortByPriority);
         $contentBlockRegistry = $this->fillContentBlockRegistry($loadedContentBlocks);
 
-        $this->publishAssets($loadedContentBlocks);
+        $this->assetPublisher->publishAssets($loadedContentBlocks);
         $this->iconProcessor->process();
 
         return $contentBlockRegistry;
@@ -317,44 +315,6 @@ protected function createPageIcon(
         return $pageIcon;
     }
 
-    /**
-     * @param LoadedContentBlock[] $loadedContentBlocks
-     */
-    protected function publishAssets(array $loadedContentBlocks): void
-    {
-        $fileSystem = new Filesystem();
-        foreach ($loadedContentBlocks as $loadedContentBlock) {
-            $hostExtension = $loadedContentBlock->getHostExtension();
-            $contentBlockExtPublicPath = $loadedContentBlock->getExtPath() . '/' . ContentBlockPathUtility::getAssetsFolder();
-            $contentBlockAbsolutePublicPath = GeneralUtility::getFileAbsFileName($contentBlockExtPublicPath);
-            // If the Content Block does not have an Assets folder, nothing to publish here.
-            if (!file_exists($contentBlockAbsolutePublicPath)) {
-                continue;
-            }
-            $hostAbsolutePublicContentBlockBasePath = ContentBlockPathUtility::getHostAbsolutePublicContentBlockBasePath($hostExtension);
-            // Prevent symlinks from being added to git index.
-            $gitIgnorePath = $hostAbsolutePublicContentBlockBasePath . '/.gitignore';
-            if (!file_exists($gitIgnorePath)) {
-                GeneralUtility::mkdir_deep($hostAbsolutePublicContentBlockBasePath);
-                file_put_contents($gitIgnorePath, '*');
-            }
-            $hostAbsolutePublicContentBlockBasePathWithVendor = $hostAbsolutePublicContentBlockBasePath . '/' . $loadedContentBlock->getVendor();
-            $contentBlockRelativePublicPath = $fileSystem->makePathRelative(
-                $contentBlockAbsolutePublicPath,
-                $hostAbsolutePublicContentBlockBasePathWithVendor
-            );
-            $hostAbsolutePublicContentBlockPath = ContentBlockPathUtility::getHostAbsolutePublicContentBlockPath(
-                $hostExtension,
-                $loadedContentBlock->getName(),
-            );
-            try {
-                $fileSystem->symlink($contentBlockRelativePublicPath, $hostAbsolutePublicContentBlockPath);
-            } catch (IOException) {
-                $fileSystem->mirror($contentBlockAbsolutePublicPath, $hostAbsolutePublicContentBlockPath);
-            }
-        }
-    }
-
     protected function getFromCache(): false|array
     {
         return $this->cache->require('ContentBlocks_Raw');