Extracted the FileUploadNormalizer service (#346)

terminal42 · Jul 3, 2024 · 86388e4 · 86388e4
1 parent c208842
commit 86388e4
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 474 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
     "require": {
         "php": "^8.1",
         "composer-plugin-api": "^2.0",
-        "codefog/contao-haste": "^5.0",
+        "codefog/contao-haste": "^5.2",
         "contao/core-bundle": "^4.13.17 || ^5.1.1",
         "doctrine/dbal": "^3.4",
         "doctrine/orm": "^2.19",

diff --git a/config/listeners.php b/config/listeners.php
@@ -4,6 +4,7 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
+use Codefog\HasteBundle\FileUploadNormalizer;
 use Codefog\HasteBundle\Formatter;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Terminal42\NotificationCenterBundle\Backend\AutoSuggester;
@@ -29,7 +30,6 @@
 use Terminal42\NotificationCenterBundle\NotificationCenter;
 use Terminal42\NotificationCenterBundle\NotificationType\NotificationTypeRegistry;
 use Terminal42\NotificationCenterBundle\Token\Definition\Factory\TokenDefinitionFactoryInterface;
-use Terminal42\NotificationCenterBundle\Util\FileUploadNormalizer;
 
 return static function (ContainerConfigurator $container): void {
     $services = $container->services();

diff --git a/config/services.php b/config/services.php
@@ -17,7 +17,6 @@
 use Terminal42\NotificationCenterBundle\Token\Definition\Factory\ChainTokenDefinitionFactory;
 use Terminal42\NotificationCenterBundle\Token\Definition\Factory\CoreTokenDefinitionFactory;
 use Terminal42\NotificationCenterBundle\Token\Definition\Factory\TokenDefinitionFactoryInterface;
-use Terminal42\NotificationCenterBundle\Util\FileUploadNormalizer;
 
 return static function (ContainerConfigurator $container): void {
     $services = $container->services();
@@ -79,12 +78,4 @@
             service('translation.locale_switcher')->nullOnInvalid(),
         ])
     ;
-
-    $services->set(FileUploadNormalizer::class)
-        ->args([
-            param('kernel.project_dir'),
-            service('mime_types'),
-            service('contao.filesystem.virtual.files'),
-        ])
-    ;
 };
diff --git a/src/EventListener/ProcessFormDataListener.php b/src/EventListener/ProcessFormDataListener.php
@@ -4,13 +4,13 @@
 
 namespace Terminal42\NotificationCenterBundle\EventListener;
 
+use Codefog\HasteBundle\FileUploadNormalizer;
 use Contao\CoreBundle\DependencyInjection\Attribute\AsHook;
 use Contao\Form;
 use Contao\StringUtil;
 use Terminal42\NotificationCenterBundle\BulkyItem\FileItem;
 use Terminal42\NotificationCenterBundle\NotificationCenter;
 use Terminal42\NotificationCenterBundle\Parcel\Stamp\BulkyItemsStamp;
-use Terminal42\NotificationCenterBundle\Util\FileUploadNormalizer;
 
 #[AsHook('processFormData')]
 class ProcessFormDataListener

diff --git a/src/Util/FileUploadNormalizer.php b/src/Util/FileUploadNormalizer.php