Updated dependencies, refactoring.

Author: DKravtsov

Makefile

@@ -356,7 +356,7 @@ ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
 	@echo "\033[32mRunning PHPStan - PHP Static Analysis Tool\033[39m"
 	@bin/console cache:clear --env=test
 	@./vendor/bin/phpstan --version
-	@./vendor/bin/phpstan analyze src tests --xdebug
+	@./vendor/bin/phpstan analyze src tests
 else
 	@make exec cmd="make phpstan"
 endif

composer.json

@@ -14,7 +14,7 @@
 		"Elasticsearch"
 	],
 	"homepage": "https://github.com/systemsdk/docker-symfony-api",
-	"version": "v1.4.5",
+	"version": "v1.4.6",
 	"license": "MIT",
 	"authors": [
 		{
@@ -41,7 +41,6 @@
 		"ext-pdo": "*",
 		"ext-pdo_mysql": "*",
 		"beberlei/doctrineextensions": "^1.3",
-		"doctrine/annotations": "^1.14",
 		"doctrine/doctrine-bundle": "^2.9",
 		"doctrine/doctrine-migrations-bundle": "^3.2",
 		"doctrine/orm": "^2.14",

composer.lock

@@ -49,7 +49,6 @@ services:
             - '../src/DependencyInjection/'
             - '../src/*/Domain/Entity/'
             - '../src/*/Transport/EventListener/'
-            - '../src/General/Application/Utils/Tests/'
             - '../src/Kernel.php'
 
     # controllers are imported separately to make sure services can be injected
@@ -84,19 +83,19 @@ when@dev:
             autoconfigure: true
 
         App\ApiKey\Infrastructure\DataFixtures\:
-            resource: '../src/ApiKey/Infrastructure/DataFixtures/'
+            resource: '../src/ApiKey/Infrastructure/DataFixtures/*'
 
         App\Role\Infrastructure\DataFixtures\:
-            resource: '../src/Role/Infrastructure/DataFixtures/'
+            resource: '../src/Role/Infrastructure/DataFixtures/*'
 
         App\User\Infrastructure\DataFixtures\:
-            resource: '../src/User/Infrastructure/DataFixtures/'
+            resource: '../src/User/Infrastructure/DataFixtures/*'
 
-        App\General\Transport\Utils\Tests\:
-            resource: '../src/General/Transport/Utils/Tests'
+        App\Tests\TestCase\:
+            resource: '../tests/TestCase/*'
 
-        App\General\Application\Utils\Tests\:
-            resource: '../src/General/Application/Utils/Tests'
+        App\Tests\Utils\:
+            resource: '../tests/Utils/*'
 
         ProxyManager\Factory\AccessInterceptorValueHolderFactory:
             class: ProxyManager\Factory\AccessInterceptorValueHolderFactory
@@ -121,16 +120,16 @@ when@test:
             public: true
 
         App\ApiKey\Infrastructure\DataFixtures\:
-            resource: '../src/ApiKey/Infrastructure/DataFixtures/'
+            resource: '../src/ApiKey/Infrastructure/DataFixtures/*'
 
         App\Role\Infrastructure\DataFixtures\:
-            resource: '../src/Role/Infrastructure/DataFixtures/'
+            resource: '../src/Role/Infrastructure/DataFixtures/*'
 
         App\User\Infrastructure\DataFixtures\:
-            resource: '../src/User/Infrastructure/DataFixtures/'
+            resource: '../src/User/Infrastructure/DataFixtures/*'
 
-        App\General\Transport\Utils\Tests\:
-            resource: '../src/General/Transport/Utils/Tests'
+        App\Tests\TestCase\:
+            resource: '../tests/TestCase/*'
 
-        App\General\Application\Utils\Tests\:
-            resource: '../src/General/Application/Utils/Tests'
+        App\Tests\Utils\:
+            resource: '../tests/Utils/*'

config/services.yaml

@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="tools/01_phpunit/vendor/phpunit/phpunit/phpunit.xsd"
          backupGlobals="false"
          bootstrap="tests/bootstrap.php"
          colors="true"
          testdox="true"
          beStrictAboutTestsThatDoNotTestAnything="true"
          beStrictAboutOutputDuringTests="true"
          processIsolation="false"
+         stopOnError="true"
          stopOnFailure="false"
+         stopOnDefect="false"
          displayDetailsOnTestsThatTriggerDeprecations="true"
          displayDetailsOnTestsThatTriggerNotices="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
          displayDetailsOnTestsThatTriggerErrors="true"
          cacheDirectory=".phpunit.cache"
 >
-    <coverage>
+    <coverage/>
+    <source>
         <include>
             <directory suffix=".php">./src</directory>
         </include>
@@ -33,7 +36,7 @@
             <directory>./src/User/Infrastructure/DataFixtures</directory>
             <file>./src/Kernel.php</file>
         </exclude>
-    </coverage>
+    </source>
     <php>
         <ini name="error_reporting" value="-1" />
         <ini name="display_errors" value="On" />

phpunit.xml.dist

@@ -9,7 +9,6 @@
 use App\Role\Domain\Enum\Role;
 use Symfony\Component\Security\Core\User\UserInterface;
 
-use function array_merge;
 use function array_unique;
 
 /**
@@ -19,13 +18,13 @@
  */
 class ApiKeyUser implements ApiKeyUserInterface, UserInterface
 {
-    private string $identifier;
-    private string $apiKeyIdentifier;
+    private readonly string $identifier;
+    private readonly string $apiKeyIdentifier;
 
     /**
      * @var array<int, string>
      */
-    private array $roles;
+    private readonly array $roles;
 
     /**
      * {@inheritdoc}
@@ -34,7 +33,7 @@ public function __construct(ApiKey $apiKey, array $roles)
     {
         $this->identifier = $apiKey->getToken();
         $this->apiKeyIdentifier = $apiKey->getId();
-        $this->roles = array_unique(array_merge($roles, [Role::API->value]));
+        $this->roles = array_unique([...$roles, Role::API->value]);
     }
 
     public function getUserIdentifier(): string

src/ApiKey/Application/Security/ApiKeyUser.php

@@ -26,7 +26,6 @@
 use Throwable;
 
 use function array_map;
-use function array_merge;
 use function array_unique;
 use function array_values;
 
@@ -204,12 +203,12 @@ public function getRoles(): array
             array_map(
                 '\strval',
                 array_unique(
-                    array_merge(
-                        [RoleEnum::API->value],
-                        $this->userGroups
+                    [
+                        RoleEnum::API->value,
+                        ...$this->userGroups
                             ->map(static fn (UserGroup $userGroup): string => $userGroup->getRole()->getId())
                             ->toArray(),
-                    ),
+                    ],
                 ),
             ),
         );

src/ApiKey/Domain/Entity/ApiKey.php

@@ -5,9 +5,9 @@
 namespace App\ApiKey\Infrastructure\DataFixtures\ORM;
 
 use App\ApiKey\Domain\Entity\ApiKey;
-use App\General\Application\Utils\Tests\PhpUnitUtil;
 use App\General\Domain\Rest\UuidHelper;
 use App\Role\Application\Security\Interfaces\RolesServiceInterface;
+use App\Tests\Utils\PhpUnitUtil;
 use App\User\Domain\Entity\UserGroup;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;

src/ApiKey/Infrastructure/DataFixtures/ORM/LoadApiKeyData.php

@@ -27,7 +27,7 @@ class ChangeTokenCommand extends Command
 {
     use SymfonyStyleTrait;
 
-    public const NAME = 'api-key:change-token';
+    final public const NAME = 'api-key:change-token';
 
     /**
      * Constructor

src/ApiKey/Transport/Command/ApiKey/ChangeTokenCommand.php

@@ -38,7 +38,7 @@ class CreateApiKeyCommand extends Command
     use ApiKeyUserManagementHelperTrait;
     use SymfonyStyleTrait;
 
-    public const NAME = 'api-key:create';
+    final public const NAME = 'api-key:create';
 
     /**
      * @var array<int, array<string, string>>