Add docker structure

Makefile

@@ -16,6 +16,8 @@ include $(ENV)
 -include $(ENV_LOCAL)
 
 
+start-rector: vendor
+	vendor/bin/rector process tests --config=rector.php
 
 coding-standards: vendor
 	vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php --diff --verbose
@@ -46,6 +48,10 @@ init:
 	@echo "run application…"
 	docker-compose up -d
 
+
+clear:
+	docker-compose run --rm php-cli composer clear-cache
+
 up:
 	@echo "run application…"
 	docker-compose up --build -d
@@ -110,7 +116,7 @@ test-run-functional: debug-print-env
 
 # Запустить один функциональный тест с дебагером
 run-one-functional-test: debug-print-env
-	docker-compose run --rm php-cli php -dxdebug.start_with_request=yes vendor/bin/phpunit --filter 'testCreateExistingAccount' tests/Functional/Bitrix24Accounts/UseCase/InstallStart/HandlerTest.php
+	docker-compose run --rm php-cli php -dxdebug.start_with_request=yes vendor/bin/phpunit --filter 'testChangeDomainUrlWithHappyPath' tests/Functional/Bitrix24Accounts/UseCase/ChangeDomainUrl/HandlerTest.php
 
 schema-drop:
 	docker-compose run --rm php-cli php bin/doctrine orm:schema-tool:drop --force

src/Bitrix24Accounts/Entity/Bitrix24Account.php

@@ -233,7 +233,7 @@ public function getUpdatedAt(): CarbonImmutable
      * @throws InvalidArgumentException
      */
     #[\Override]
-    public function updateApplicationVersion(int $version, ?Scope $newScope): void
+    public function updateApplicationVersion(AuthToken $authToken, int $b24UserId, int $version, ?Scope $newScope): void
     {
         if (Bitrix24AccountStatus::active !== $this->status) {
             throw new InvalidArgumentException(

src/Bitrix24Accounts/UseCase/ChangeDomainUrl/Command.php

@@ -4,37 +4,19 @@
 
 namespace Bitrix24\Lib\Bitrix24Accounts\UseCase\ChangeDomainUrl;
 
+use Bitrix24\Lib\Bitrix24Accounts\ValueObjects\Domain;
+
 readonly class Command
 {
-    public function __construct(
-        /**
-         * @var non-empty-string $oldDomain
-         */
-        public string $oldDomain,
-        /**
-         * @var non-empty-string $newDomain
-         */
-        public string $newDomain
-    ) {
-        $this->validateDomain($oldDomain, 'oldDomainUrlHost');
-        $this->validateDomain($newDomain, 'newDomainUrlHost');
-    }
+    public string $oldDomain;
 
-    private function validateDomain(string $domain, string $parameterName): void
-    {
-        // Регулярное выражение для проверки допустимых символов (латиница и кириллица)
-        $patternValidChars = '/^((?!-)[A-Za-zА-Яа-яЁё0-9-]{1,63}(?<!-)\.)+[A-Za-zА-Яа-яЁё]{2,6}$/u';
+    public string $newDomain;
 
-        // Проверка общей длины (1-253 символа)
-        $patternLengthCheck = '/^.{1,253}$/';
-
-        // Проверка длины каждой метки (1-63 символа, включая кириллицу)
-        $patternLengthEachLabel = '/^[A-Za-zА-Яа-яЁё0-9-]{1,63}(\.[A-Za-zА-Яа-яЁё0-9-]{1,63})*$/u';
-        if (
-            in_array(preg_match($patternValidChars, $domain), [0, false], true)
-            || in_array(preg_match($patternLengthCheck, $domain), [0, false], true)
-            || in_array(preg_match($patternLengthEachLabel, $domain), [0, false], true)) {
-            throw new \InvalidArgumentException(sprintf('Invalid value for %s: %s', $parameterName, $domain));
-        }
+    public function __construct(
+        Domain $oldDomain,
+        Domain $newDomain
+    ) {
+        $this->oldDomain = $oldDomain->getValue();
+        $this->newDomain = $newDomain->getValue();
     }
 }

src/Bitrix24Accounts/UseCase/InstallFinish/Command.php

@@ -4,49 +4,34 @@
 
 namespace Bitrix24\Lib\Bitrix24Accounts\UseCase\InstallFinish;
 
+use Bitrix24\Lib\Bitrix24Accounts\ValueObjects\Domain;
+
 readonly class Command
 {
+    public string $domain;
+
     public function __construct(
         public string $applicationToken,
         public string $memberId,
-        public string $domainUrl,
+        Domain $domain,
         public int $bitrix24UserId,
     ) {
         $this->validate();
+        $this->domain = $domain->getValue();
     }
 
     private function validate(): void
     {
-        if ('' === $this->applicationToken || '0' === $this->applicationToken) {
+        if ('' === $this->applicationToken) {
             throw new \InvalidArgumentException('Application token cannot be empty.');
         }
 
         if ('' === $this->memberId || '0' === $this->memberId) {
             throw new \InvalidArgumentException('Member ID cannot be empty.');
         }
 
-        $this->validateDomain($this->domainUrl);
-
         if ($this->bitrix24UserId <= 0) {
             throw new \InvalidArgumentException('Bitrix24 User ID must be a positive integer.');
         }
     }
-
-    private function validateDomain(string $domain): void
-    {
-        // Регулярное выражение для проверки допустимых символов (латиница и кириллица)
-        $patternValidChars = '/^((?!-)[A-Za-zА-Яа-яЁё0-9-]{1,63}(?<!-)\.)+[A-Za-zА-Яа-яЁё]{2,6}$/u';
-
-        // Проверка общей длины (1-253 символа)
-        $patternLengthCheck = '/^.{1,253}$/';
-
-        // Проверка длины каждой метки (1-63 символа, включая кириллицу)
-        $patternLengthEachLabel = '/^[A-Za-zА-Яа-яЁё0-9-]{1,63}(\.[A-Za-zА-Яа-яЁё0-9-]{1,63})*$/u';
-        if (
-            in_array(preg_match($patternValidChars, $domain), [0, false], true)
-            || in_array(preg_match($patternLengthCheck, $domain), [0, false], true)
-            || in_array(preg_match($patternLengthEachLabel, $domain), [0, false], true)) {
-            throw new \InvalidArgumentException('Domain URL is not valid.');
-        }
-    }
 }

src/Bitrix24Accounts/UseCase/InstallFinish/Handler.php

@@ -30,14 +30,14 @@ public function __construct(
     public function handle(Command $command): void
     {
         $this->logger->info('Bitrix24Accounts.InstallFinish.start', [
-            'b24_domain_url' => $command->domainUrl,
+            'b24_domain_url' => $command->domain,
             'b24_member_id' => $command->memberId,
             'b24_application_id' => $command->applicationToken,
             'b24_user_id' => $command->bitrix24UserId,
         ]);
 
         /** @var AggregateRootEventsEmitterInterface|Bitrix24AccountInterface $bitrix24Account */
-        $bitrix24Account = $this->getSingleAccountByMemberId($command->domainUrl, $command->memberId, $command->bitrix24UserId);
+        $bitrix24Account = $this->getSingleAccountByMemberId($command->domain, $command->memberId, $command->bitrix24UserId);
 
         $bitrix24Account->applicationInstalled($command->applicationToken);
 
@@ -47,7 +47,7 @@ public function handle(Command $command): void
         $this->logger->info(
             'Bitrix24Accounts.InstallFinish.Finish',
             [
-                'b24_domain_url' => $command->domainUrl,
+                'b24_domain_url' => $command->domain,
                 'b24_member_id' => $command->memberId,
                 'b24_application_id' => $command->applicationToken,
                 'b24_user_id' => $command->bitrix24UserId,

src/Bitrix24Accounts/UseCase/InstallStart/Command.php

@@ -4,61 +4,41 @@
 
 namespace Bitrix24\Lib\Bitrix24Accounts\UseCase\InstallStart;
 
+use Bitrix24\Lib\Bitrix24Accounts\ValueObjects\Domain;
 use Bitrix24\SDK\Core\Credentials\AuthToken;
 use Bitrix24\SDK\Core\Credentials\Scope;
 use Symfony\Component\Uid\Uuid;
 
 readonly class Command
 {
+    public string $domain;
+
     public function __construct(
         public Uuid $uuid,
         public int $bitrix24UserId,
         public bool $isBitrix24UserAdmin,
         public string $memberId,
-        public string $domainUrl,
+        Domain $domain,
         public AuthToken $authToken,
         public int $applicationVersion,
         public Scope $applicationScope
     ) {
         $this->validate();
+        $this->domain = $domain->getValue();
     }
 
     private function validate(): void
     {
-        if (empty($this->uuid)) {
-            throw new \InvalidArgumentException('Empty UUID provided.');
-        }
-
         if ($this->bitrix24UserId <= 0) {
             throw new \InvalidArgumentException('Bitrix24 User ID must be a positive integer.');
         }
 
-        if (!is_string($this->memberId) || ('' === $this->memberId || '0' === $this->memberId)) {
+        if ('' === $this->memberId) {
             throw new \InvalidArgumentException('Member ID must be a non-empty string.');
         }
 
-        $this->validateDomain($this->domainUrl);
-
         if ($this->applicationVersion <= 0) {
             throw new \InvalidArgumentException('Application version must be a positive integer.');
         }
     }
-
-    private function validateDomain(string $domain): void
-    {
-        // Регулярное выражение для проверки допустимых символов (латиница и кириллица)
-        $patternValidChars = '/^((?!-)[A-Za-zА-Яа-яЁё0-9-]{1,63}(?<!-)\.)+[A-Za-zА-Яа-яЁё]{2,6}$/u';
-
-        // Проверка общей длины (1-253 символа)
-        $patternLengthCheck = '/^.{1,253}$/';
-
-        // Проверка длины каждой метки (1-63 символа, включая кириллицу)
-        $patternLengthEachLabel = '/^[A-Za-zА-Яа-яЁё0-9-]{1,63}(\.[A-Za-zА-Яа-яЁё0-9-]{1,63})*$/u';
-        if (
-            in_array(preg_match($patternValidChars, $domain), [0, false], true)
-            || in_array(preg_match($patternLengthCheck, $domain), [0, false], true)
-            || in_array(preg_match($patternLengthEachLabel, $domain), [0, false], true)) {
-            throw new \InvalidArgumentException('Domain URL is not valid.');
-        }
-    }
 }

src/Bitrix24Accounts/UseCase/InstallStart/Handler.php

@@ -24,7 +24,7 @@
     {
         $this->logger->info('Bitrix24Accounts.InstallStart.start', [
             'id' => $command->uuid->toRfc4122(),
-            'domain_url' => $command->domainUrl,
+            'domain' => $command->domain,
             'member_id' => $command->memberId,
         ]);
 
@@ -33,7 +33,7 @@
             $command->bitrix24UserId,
             $command->isBitrix24UserAdmin,
             $command->memberId,
-            $command->domainUrl,
+            $command->domain,
             Bitrix24AccountStatus::new,
             $command->authToken,
             new CarbonImmutable(),
@@ -43,7 +43,7 @@
             true
         );
 
         $isAccountExists = $this->bitrix24AccountRepository->existsById($bitrix24Account->getId());
 
         if (!$isAccountExists) {
             $this->bitrix24AccountRepository->save($bitrix24Account);
@@ -53,7 +53,7 @@
                 'Bitrix24Accounts.InstallStart.Finish',
                 [
                     'id' => $command->uuid->toRfc4122(),
-                    'domain_url' => $command->domainUrl,
+                    'domain_url' => $command->domain,
                     'member_id' => $command->memberId,
                 ]
             );
@@ -62,7 +62,7 @@
                 'Bitrix24Accounts.InstallStart.AlreadyExists',
                 [
                     'id' => $command->uuid->toRfc4122(),
-                    'domain_url' => $command->domainUrl,
+                    'domain' => $command->domain,
                     'member_id' => $command->memberId,
                 ]
             );

src/Bitrix24Accounts/UseCase/Uninstall/Command.php

@@ -17,8 +17,8 @@ public function __construct(
 
     private function validate(): void
     {
-        if ('' === $this->applicationToken || '0' === $this->applicationToken) {
-            throw new \InvalidArgumentException('Empty application token application token.');
+        if ('' === $this->applicationToken) {
+            throw new \InvalidArgumentException('Application token must be a non-empty string.');
         }
     }
 }

src/Bitrix24Accounts/ValueObjects/Domain.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bitrix24\Lib\Bitrix24Accounts\ValueObjects;
+
+readonly class Domain
+{
+    private string $value;
+
+    public function __construct(string $domain)
+    {
+        $this->validate($domain);
+        $this->value = $domain;
+    }
+
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+
+    private function validate(string $domain): void
+    {
+        // Регулярное выражение для проверки допустимых символов (латиница и кириллица)
+        $patternValidChars = '/^((?!-)[A-Za-zА-Яа-яЁё0-9-]{1,63}(?<!-)\.)+[A-Za-zА-Яа-яЁё]{2,6}$/u';
+
+        // Проверка общей длины (1-253 символа)
+        $patternLengthCheck = '/^.{1,253}$/';
+
+        // Проверка длины каждой метки (1-63 символа, включая кириллицу)
+        $patternLengthEachLabel = '/^[A-Za-zА-Яа-яЁё0-9-]{1,63}(\.[A-Za-zА-Яа-яЁё0-9-]{1,63})*$/u';
+        if (
+            in_array(preg_match($patternValidChars, $domain), [0, false], true)
+            || in_array(preg_match($patternLengthCheck, $domain), [0, false], true)
+            || in_array(preg_match($patternLengthEachLabel, $domain), [0, false], true)) {
+            throw new \InvalidArgumentException(sprintf('Invalid domain: %s', $domain));
+        }
+    }
+}

tests/Functional/Bitrix24Accounts/Builders/Bitrix24AccountBuilder.php

@@ -98,7 +98,7 @@ public function withStatus(Bitrix24AccountStatus $bitrix24AccountStatus): self
         return $this;
     }
 
-    public function build(): AggregateRootEventsEmitterInterface&Bitrix24AccountInterface
+    public function build(): Bitrix24Account
     {
         $bitrix24Account = new Bitrix24Account(
             $this->id,

tests/Functional/Bitrix24Accounts/UseCase/ChangeDomainUrl/HandlerTest.php

@@ -29,6 +29,7 @@
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\Uid\Uuid;
+use Bitrix24\Lib\Bitrix24Accounts\ValueObjects\Domain;
 
 /**
  * @internal
@@ -74,8 +75,8 @@ public function testChangeDomainUrlForAccount(): void
 
         $this->handler->handle(
             new Bitrix24Accounts\UseCase\ChangeDomainUrl\Command(
-                $oldDomainUrl,
-                $newDomainUrl
+                new Domain($oldDomainUrl),
+                new Domain($newDomainUrl)
             )
         );
 
@@ -126,8 +127,8 @@ public function testChangeDomainUrlForManyAccounts(): void
 
         $this->handler->handle(
             new Bitrix24Accounts\UseCase\ChangeDomainUrl\Command(
-                $oldDomainUrl,
-                $newDomainUrl
+                new Domain($oldDomainUrl),
+                new Domain($newDomainUrl)
             )
         );
 

tests/Functional/Bitrix24Accounts/UseCase/InstallFinish/HandlerTest.php

@@ -30,6 +30,7 @@
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\Uid\Uuid;
+use Bitrix24\Lib\Bitrix24Accounts\ValueObjects\Domain;
 
 /**
  * @internal
@@ -78,7 +79,7 @@ public function testFinishInstallationApplication(): void
             new Bitrix24Accounts\UseCase\InstallFinish\Command(
                 $applicationToken,
                 $bitrix24Account->getMemberId(),
-                $bitrix24Account->getDomainUrl(),
+                new Domain($bitrix24Account->getDomainUrl()),
                 $bitrix24Account->getBitrix24UserId()
             )
         );