Merge pull request #129 from 15web/94956-refactor-group-infrastructure-classes

pchelk1n · web-flow · commit 44290bf2a5e2 · 2023-09-21T12:23:18.000+03:00
refactor(Infrastructure): сгруппировал классы в Infrastructure
diff --git a/backend/src/Infrastructure/EventSubscriber/ExceptionEventSubscriber.php b/backend/src/Infrastructure/EventSubscriber/ExceptionEventSubscriber.php
@@ -2,8 +2,10 @@
 
 declare(strict_types=1);
 
-namespace App\Infrastructure\ApiException;
+namespace App\Infrastructure\EventSubscriber;
 
+use App\Infrastructure\ApiException\ApiException;
+use App\Infrastructure\ApiException\CreateExceptionJsonResponse;
 use App\Infrastructure\AsService;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
diff --git a/backend/src/Infrastructure/EventSubscriber/MailerSubscriber.php b/backend/src/Infrastructure/EventSubscriber/MailerSubscriber.php
@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Infrastructure;
+namespace App\Infrastructure\EventSubscriber;
 
+use App\Infrastructure\AsService;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Mailer\Event\MessageEvent;
diff --git a/backend/src/Infrastructure/EventSubscriber/OpenApiValidateSubscriber.php b/backend/src/Infrastructure/EventSubscriber/OpenApiValidateSubscriber.php
@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Infrastructure;
+namespace App\Infrastructure\EventSubscriber;
 
+use App\Infrastructure\AsService;
 use League\OpenAPIValidation\PSR7\OperationAddress;
 use League\OpenAPIValidation\PSR7\RequestValidator;
 use League\OpenAPIValidation\PSR7\ResponseValidator;
diff --git a/backend/src/Infrastructure/EventSubscriber/ResponseEventSubscriber.php b/backend/src/Infrastructure/EventSubscriber/ResponseEventSubscriber.php
@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Infrastructure;
+namespace App\Infrastructure\EventSubscriber;
 
+use App\Infrastructure\AsService;
 use RuntimeException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
diff --git a/backend/src/Infrastructure/ValueObject/Email.php b/backend/src/Infrastructure/ValueObject/Email.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Infrastructure;
+namespace App\Infrastructure\ValueObject;
 
 use Doctrine\ORM\Mapping as ORM;
 use Webmozart\Assert\Assert;
diff --git a/backend/src/Infrastructure/ValueObject/Phone.php b/backend/src/Infrastructure/ValueObject/Phone.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Infrastructure;
+namespace App\Infrastructure\ValueObject;
 
 use Doctrine\ORM\Mapping as ORM;
 use Webmozart\Assert\Assert;
diff --git a/backend/src/Infrastructure/ValueObject/ValueObject.php b/backend/src/Infrastructure/ValueObject/ValueObject.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Infrastructure;
+namespace App\Infrastructure\ValueObject;
 
 /**
  * Интерфейс для всех ValueObject
diff --git a/backend/src/Task/Domain/TaskCommentBody.php b/backend/src/Task/Domain/TaskCommentBody.php
@@ -4,7 +4,7 @@
 
 namespace App\Task\Domain;
 
-use App\Infrastructure\ValueObject;
+use App\Infrastructure\ValueObject\ValueObject;
 use Doctrine\ORM\Mapping as ORM;
 use Webmozart\Assert\Assert;
 
diff --git a/backend/src/Task/Domain/TaskCommentId.php b/backend/src/Task/Domain/TaskCommentId.php
@@ -4,7 +4,7 @@
 
 namespace App\Task\Domain;
 
-use App\Infrastructure\ValueObject;
+use App\Infrastructure\ValueObject\ValueObject;
 use Symfony\Component\Uid\Uuid;
 use Symfony\Component\Uid\UuidV7;
 
diff --git a/backend/src/Task/Domain/TaskId.php b/backend/src/Task/Domain/TaskId.php
@@ -4,7 +4,7 @@
 
 namespace App\Task\Domain;
 
-use App\Infrastructure\ValueObject;
+use App\Infrastructure\ValueObject\ValueObject;
 use Symfony\Component\Uid\Uuid;
 use Symfony\Component\Uid\UuidV7;
 
diff --git a/backend/src/Task/Domain/TaskName.php b/backend/src/Task/Domain/TaskName.php
@@ -4,7 +4,7 @@
 
 namespace App\Task\Domain;
 
-use App\Infrastructure\ValueObject;
+use App\Infrastructure\ValueObject\ValueObject;
 use Doctrine\ORM\Mapping as ORM;
 use Webmozart\Assert\Assert;
 
diff --git a/backend/src/User/Profile/Command/SaveProfile/CreateProfile.php b/backend/src/User/Profile/Command/SaveProfile/CreateProfile.php
@@ -5,7 +5,7 @@
 namespace App\User\Profile\Command\SaveProfile;
 
 use App\Infrastructure\AsService;
-use App\Infrastructure\Phone;
+use App\Infrastructure\ValueObject\Phone;
 use App\User\Profile\Domain\Profile;
 use App\User\Profile\Domain\ProfileId;
 use App\User\Profile\Domain\Profiles;
diff --git a/backend/src/User/Profile/Command/SaveProfile/UpdateProfile.php b/backend/src/User/Profile/Command/SaveProfile/UpdateProfile.php
@@ -5,7 +5,7 @@
 namespace App\User\Profile\Command\SaveProfile;
 
 use App\Infrastructure\AsService;
-use App\Infrastructure\Phone;
+use App\Infrastructure\ValueObject\Phone;
 use App\User\Profile\Domain\Profile;
 
 /**
diff --git a/backend/src/User/Profile/Domain/Profile.php b/backend/src/User/Profile/Domain/Profile.php
@@ -4,7 +4,7 @@
 
 namespace App\User\Profile\Domain;
 
-use App\Infrastructure\Phone;
+use App\Infrastructure\ValueObject\Phone;
 use App\User\SignUp\Domain\UserId;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Uid\Uuid;
diff --git a/backend/src/User/Profile/Domain/ProfileId.php b/backend/src/User/Profile/Domain/ProfileId.php
@@ -4,7 +4,7 @@
 
 namespace App\User\Profile\Domain;
 
-use App\Infrastructure\ValueObject;
+use App\Infrastructure\ValueObject\ValueObject;
 use Symfony\Component\Uid\Uuid;
 use Symfony\Component\Uid\UuidV7;
 
diff --git a/backend/src/User/SignUp/Command/SignUp.php b/backend/src/User/SignUp/Command/SignUp.php
@@ -5,7 +5,7 @@
 namespace App\User\SignUp\Command;
 
 use App\Infrastructure\AsService;
-use App\Infrastructure\Email;
+use App\Infrastructure\ValueObject\Email;
 use App\Mailer\Notification\EmailConfirmation\ConfirmEmailMessage;
 use App\User\SignUp\Domain\ConfirmToken;
 use App\User\SignUp\Domain\User;
diff --git a/backend/src/User/SignUp/Domain/ConfirmToken.php b/backend/src/User/SignUp/Domain/ConfirmToken.php
@@ -4,7 +4,7 @@
 
 namespace App\User\SignUp\Domain;
 
-use App\Infrastructure\ValueObject;
+use App\Infrastructure\ValueObject\ValueObject;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Uid\Uuid;
 
diff --git a/backend/src/User/SignUp/Domain/User.php b/backend/src/User/SignUp/Domain/User.php
@@ -4,7 +4,7 @@
 
 namespace App\User\SignUp\Domain;
 
-use App\Infrastructure\Email;
+use App\Infrastructure\ValueObject\Email;
 use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
diff --git a/backend/src/User/SignUp/Domain/UserId.php b/backend/src/User/SignUp/Domain/UserId.php
@@ -4,7 +4,7 @@
 
 namespace App\User\SignUp\Domain;
 
-use App\Infrastructure\ValueObject;
+use App\Infrastructure\ValueObject\ValueObject;
 use Symfony\Component\Uid\Uuid;
 use Symfony\Component\Uid\UuidV7;
 
diff --git a/backend/src/User/SignUp/Domain/UserPassword.php b/backend/src/User/SignUp/Domain/UserPassword.php
@@ -4,7 +4,7 @@
 
 namespace App\User\SignUp\Domain;
 
-use App\Infrastructure\ValueObject;
+use App\Infrastructure\ValueObject\ValueObject;
 use Doctrine\ORM\Mapping as ORM;
 use Webmozart\Assert\Assert;
 
diff --git a/backend/tests/Functional/SDK/ApiWebTestCase.php b/backend/tests/Functional/SDK/ApiWebTestCase.php
@@ -4,7 +4,7 @@
 
 namespace App\Tests\Functional\SDK;
 
-use App\Infrastructure\OpenApiValidateSubscriber;
+use App\Infrastructure\EventSubscriber\OpenApiValidateSubscriber;
 use Iterator;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/backend/tests/Unit/Infrastructure/EmailTest.php b/backend/tests/Unit/Infrastructure/EmailTest.php
@@ -4,7 +4,7 @@
 
 namespace App\Tests\Unit\Infrastructure;
 
-use App\Infrastructure\Email;
+use App\Infrastructure\ValueObject\Email;
 use InvalidArgumentException;
 use PHPUnit\Framework\Attributes\TestDox;
 use PHPUnit\Framework\TestCase;
diff --git a/backend/tests/Unit/Infrastructure/PhoneTest.php b/backend/tests/Unit/Infrastructure/PhoneTest.php
@@ -4,7 +4,7 @@
 
 namespace App\Tests\Unit\Infrastructure;
 
-use App\Infrastructure\Phone;
+use App\Infrastructure\ValueObject\Phone;
 use InvalidArgumentException;
 use Iterator;
 use PHPUnit\Framework\Attributes\DataProvider;
