Move a few classes around

tatevikg1 · tatevikg1 · commit 7828c54da58f · 2026-07-13T15:24:26.000+04:00
diff --git a/config/services/services.yml b/config/services/services.yml
@@ -112,7 +112,7 @@ services:
     autoconfigure: true
 
   # External image caching/downloading helper used by TemplateImageEmbedder
-  PhpList\Core\Domain\Common\ExternalImageService:
+  PhpList\Core\Domain\Common\Service\ExternalImageService:
     autowire: true
     autoconfigure: true
     arguments:
@@ -268,13 +268,13 @@ services:
       $uploadImageDir: '%phplist.upload_images_dir%'
       $publicSchema: '%phplist.public_schema%'
 
-  PhpList\Core\Domain\Common\Upload\UploadService:
+  PhpList\Core\Domain\Common\Upload\Service\UploadService:
     autowire: true
     autoconfigure: true
 
-  PhpList\Core\Domain\Common\Upload\Storage\LocalUploadStorage:
+  PhpList\Core\Domain\Common\Storage\UploadStorageInterface:
+    alias: PhpList\Core\Domain\Common\Storage\LocalUploadStorage
+
+  PhpList\Core\Domain\Common\Storage\LocalUploadStorage:
     autowire: true
     autoconfigure: true
-
-  PhpList\Core\Domain\Common\Upload\Storage\UploadStorageInterface:
-    alias: PhpList\Core\Domain\Common\Upload\Storage\LocalUploadStorage
diff --git a/config/services/validators.yml b/config/services/validators.yml
@@ -11,6 +11,6 @@ services:
     autowire: true
     autoconfigure: true
 
-  PhpList\Core\Domain\Common\Upload\UploadValidator:
+  PhpList\Core\Domain\Common\Validator\UploadValidator:
     autowire: true
     autoconfigure: true
diff --git a/src/Domain/Common/Exception/InvalidUploadException.php b/src/Domain/Common/Exception/InvalidUploadException.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Common\Upload\Exception;
+namespace PhpList\Core\Domain\Common\Exception;
 
 class InvalidUploadException extends UploadException
 {
diff --git a/src/Domain/Common/Exception/MissingUploadException.php b/src/Domain/Common/Exception/MissingUploadException.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Common\Upload\Exception;
+namespace PhpList\Core\Domain\Common\Exception;
 
 class MissingUploadException extends UploadException
 {
diff --git a/src/Domain/Common/Exception/StorageException.php b/src/Domain/Common/Exception/StorageException.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Common\Upload\Exception;
+namespace PhpList\Core\Domain\Common\Exception;
 
 class StorageException extends UploadException
 {
diff --git a/src/Domain/Common/Exception/UnsupportedExtensionException.php b/src/Domain/Common/Exception/UnsupportedExtensionException.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Common\Upload\Exception;
+namespace PhpList\Core\Domain\Common\Exception;
 
 class UnsupportedExtensionException extends UploadException
 {
diff --git a/src/Domain/Common/Exception/UnsupportedMimeTypeException.php b/src/Domain/Common/Exception/UnsupportedMimeTypeException.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Common\Upload\Exception;
+namespace PhpList\Core\Domain\Common\Exception;
 
 class UnsupportedMimeTypeException extends UploadException
 {
diff --git a/src/Domain/Common/Exception/UploadException.php b/src/Domain/Common/Exception/UploadException.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Common\Upload\Exception;
+namespace PhpList\Core\Domain\Common\Exception;
 
 use RuntimeException;
 
diff --git a/src/Domain/Common/Exception/UploadTooLargeException.php b/src/Domain/Common/Exception/UploadTooLargeException.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Common\Upload\Exception;
+namespace PhpList\Core\Domain\Common\Exception;
 
 class UploadTooLargeException extends UploadException
 {
diff --git a/src/Domain/Common/Model/StoredFile.php b/src/Domain/Common/Model/StoredFile.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Common\Upload\Storage;
+namespace PhpList\Core\Domain\Common\Model;
 
 class StoredFile
 {
diff --git a/src/Domain/Common/Model/UploadResult.php b/src/Domain/Common/Model/UploadResult.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Common\Upload;
+namespace PhpList\Core\Domain\Common\Model;
 
 class UploadResult
 {
diff --git a/src/Domain/Common/Service/ExternalImageService.php b/src/Domain/Common/Service/ExternalImageService.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Common;
+namespace PhpList\Core\Domain\Common\Service;
 
 use PhpList\Core\Domain\Configuration\Model\ConfigOption;
 use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
diff --git a/src/Domain/Common/Service/UploadService.php b/src/Domain/Common/Service/UploadService.php
@@ -2,11 +2,13 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Common\Upload;
+namespace PhpList\Core\Domain\Common\Service;
 
-use PhpList\Core\Domain\Common\Upload\Exception\InvalidUploadException;
-use PhpList\Core\Domain\Common\Upload\Exception\StorageException;
-use PhpList\Core\Domain\Common\Upload\Storage\UploadStorageInterface;
+use PhpList\Core\Domain\Common\Exception\InvalidUploadException;
+use PhpList\Core\Domain\Common\Exception\StorageException;
+use PhpList\Core\Domain\Common\Model\UploadResult;
+use PhpList\Core\Domain\Common\Storage\UploadStorageInterface;
+use PhpList\Core\Domain\Common\Validator\UploadValidator;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\RequestStack;
diff --git a/src/Domain/Common/Storage/LocalUploadStorage.php b/src/Domain/Common/Storage/LocalUploadStorage.php
@@ -2,9 +2,10 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Common\Upload\Storage;
+namespace PhpList\Core\Domain\Common\Storage;
 
-use PhpList\Core\Domain\Common\Upload\Exception\StorageException;
+use PhpList\Core\Domain\Common\Exception\StorageException;
+use PhpList\Core\Domain\Common\Model\StoredFile;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
diff --git a/src/Domain/Common/Storage/UploadStorageInterface.php b/src/Domain/Common/Storage/UploadStorageInterface.php
@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Common\Upload\Storage;
+namespace PhpList\Core\Domain\Common\Storage;
 
+use PhpList\Core\Domain\Common\Model\StoredFile;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 interface UploadStorageInterface
diff --git a/src/Domain/Common/Validator/UploadValidator.php b/src/Domain/Common/Validator/UploadValidator.php
@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Common\Upload;
+namespace PhpList\Core\Domain\Common\Validator;
 
-use PhpList\Core\Domain\Common\Upload\Exception\InvalidUploadException;
-use PhpList\Core\Domain\Common\Upload\Exception\MissingUploadException;
-use PhpList\Core\Domain\Common\Upload\Exception\UnsupportedExtensionException;
-use PhpList\Core\Domain\Common\Upload\Exception\UnsupportedMimeTypeException;
-use PhpList\Core\Domain\Common\Upload\Exception\UploadTooLargeException;
+use PhpList\Core\Domain\Common\Exception\InvalidUploadException;
+use PhpList\Core\Domain\Common\Exception\MissingUploadException;
+use PhpList\Core\Domain\Common\Exception\UnsupportedExtensionException;
+use PhpList\Core\Domain\Common\Exception\UnsupportedMimeTypeException;
+use PhpList\Core\Domain\Common\Exception\UploadTooLargeException;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
diff --git a/src/Domain/Messaging/Service/TemplateImageEmbedder.php b/src/Domain/Messaging/Service/TemplateImageEmbedder.php
@@ -5,8 +5,8 @@
 namespace PhpList\Core\Domain\Messaging\Service;
 
 use Exception;
-use PhpList\Core\Domain\Common\ExternalImageService;
 use PhpList\Core\Domain\Common\Model\ContentTransferEncoding;
+use PhpList\Core\Domain\Common\Service\ExternalImageService;
 use PhpList\Core\Domain\Configuration\Model\ConfigOption;
 use PhpList\Core\Domain\Configuration\Model\Dto\CreateConfigDto;
 use PhpList\Core\Domain\Configuration\Service\Manager\ConfigManager;
diff --git a/tests/Unit/Domain/Common/Service/UploadServiceTest.php b/tests/Unit/Domain/Common/Service/UploadServiceTest.php
@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Tests\Unit\Domain\Common\Upload;
+namespace PhpList\Core\Tests\Unit\Domain\Common\Service;
 
-use PhpList\Core\Domain\Common\Upload\Exception\StorageException;
-use PhpList\Core\Domain\Common\Upload\Storage\StoredFile;
-use PhpList\Core\Domain\Common\Upload\Storage\UploadStorageInterface;
-use PhpList\Core\Domain\Common\Upload\UploadResult;
-use PhpList\Core\Domain\Common\Upload\UploadService;
-use PhpList\Core\Domain\Common\Upload\UploadValidator;
+use PhpList\Core\Domain\Common\Exception\StorageException;
+use PhpList\Core\Domain\Common\Model\StoredFile;
+use PhpList\Core\Domain\Common\Model\UploadResult;
+use PhpList\Core\Domain\Common\Service\UploadService;
+use PhpList\Core\Domain\Common\Storage\UploadStorageInterface;
+use PhpList\Core\Domain\Common\Validator\UploadValidator;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/tests/Unit/Domain/Common/Storage/LocalUploadStorageTest.php b/tests/Unit/Domain/Common/Storage/LocalUploadStorageTest.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Tests\Unit\Domain\Common\Upload\Storage;
+namespace PhpList\Core\Tests\Unit\Domain\Common\Storage;
 
-use PhpList\Core\Domain\Common\Upload\Exception\StorageException;
-use PhpList\Core\Domain\Common\Upload\Storage\LocalUploadStorage;
+use PhpList\Core\Domain\Common\Exception\StorageException;
+use PhpList\Core\Domain\Common\Storage\LocalUploadStorage;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
diff --git a/tests/Unit/Domain/Common/Validator/UploadValidatorTest.php b/tests/Unit/Domain/Common/Validator/UploadValidatorTest.php
@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Tests\Unit\Domain\Common\Upload;
-
-use PhpList\Core\Domain\Common\Upload\Exception\InvalidUploadException;
-use PhpList\Core\Domain\Common\Upload\Exception\MissingUploadException;
-use PhpList\Core\Domain\Common\Upload\Exception\UnsupportedExtensionException;
-use PhpList\Core\Domain\Common\Upload\Exception\UnsupportedMimeTypeException;
-use PhpList\Core\Domain\Common\Upload\Exception\UploadTooLargeException;
-use PhpList\Core\Domain\Common\Upload\UploadValidator;
+namespace PhpList\Core\Tests\Unit\Domain\Common\Validator;
+
+use PhpList\Core\Domain\Common\Exception\InvalidUploadException;
+use PhpList\Core\Domain\Common\Exception\MissingUploadException;
+use PhpList\Core\Domain\Common\Exception\UnsupportedExtensionException;
+use PhpList\Core\Domain\Common\Exception\UnsupportedMimeTypeException;
+use PhpList\Core\Domain\Common\Exception\UploadTooLargeException;
+use PhpList\Core\Domain\Common\Validator\UploadValidator;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
diff --git a/tests/Unit/Domain/Messaging/Service/TemplateImageEmbedderTest.php b/tests/Unit/Domain/Messaging/Service/TemplateImageEmbedderTest.php
@@ -4,7 +4,7 @@
 
 namespace PhpList\Core\Tests\Unit\Domain\Messaging\Service;
 
-use PhpList\Core\Domain\Common\ExternalImageService;
+use PhpList\Core\Domain\Common\Service\ExternalImageService;
 use PhpList\Core\Domain\Configuration\Model\ConfigOption;
 use PhpList\Core\Domain\Configuration\Service\Manager\ConfigManager;
 use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`		`-namespace PhpList\Core\Domain\Common\Upload\Exception;`
	`5`	`+namespace PhpList\Core\Domain\Common\Exception;`
`6`	`6`
`7`	`7`	`class InvalidUploadException extends UploadException`
`8`	`8`	`{`