updated bundles + improvements

Author: dmitriy

Makefile

@@ -201,10 +201,10 @@ phpcs: ## Run PHP CodeSniffer
 
 ###> ecs ###
 ecs: ## Run Easy Coding Standard
-	@make exec-bash cmd="error_reporting=0 ./vendor/bin/ecs --clear-cache check src tests"
+	@make exec-bash cmd="./vendor/bin/ecs --version && ./vendor/bin/ecs --clear-cache check src tests"
 
 ecs-fix: ## Run The Easy Coding Standard to fix issues
-	@make exec-bash cmd="error_reporting=0 ./vendor/bin/ecs --clear-cache --fix check src tests"
+	@make exec-bash cmd="./vendor/bin/ecs --version && ./vendor/bin/ecs --clear-cache --fix check src tests"
 ###< ecs ###
 
 ###> phpmetrics ###

composer.json

@@ -59,7 +59,7 @@
 		"symfony/intl": "4.4.*",
 		"symfony/mailer": "4.4.*",
 		"symfony/messenger": "4.4.*",
-		"symfony/monolog-bundle": "^3.5",
+		"symfony/monolog-bundle": "^3.6",
 		"symfony/orm-pack": "*",
 		"symfony/process": "4.4.*",
 		"symfony/routing": "4.4.*",
@@ -121,10 +121,13 @@
 	"autoload-dev": {
 		"psr-4": {
 			"App\\Tests\\": "tests/",
-			"PHPUnit\\": "tools/01_phpunit/vendor/phpunit/phpunit/src/",
+			"PHPUnit\\": "tools/01_phpunit/vendor/phpunit/phpunit/src",
 			"Symfony\\Component\\BrowserKit\\": "tools/01_phpunit/vendor/symfony/browser-kit",
 			"Symfony\\Bridge\\PhpUnit\\": "tools/01_phpunit/vendor/symfony/phpunit-bridge",
-			"PHPMD\\": "tools/06_phpmd/vendor/phpmd/phpmd/src/bin"
+			"PHPMD\\": "tools/06_phpmd/vendor/phpmd/phpmd/src/bin",
+			"PhpCsFixer\\": "tools/03_ecs/vendor/friendsofphp/php-cs-fixer/src",
+			"SlevomatCodingStandard\\": "tools/03_ecs/vendor/slevomat/coding-standard/SlevomatCodingStandard",
+			"Symplify\\CodingStandard\\": "tools/03_ecs/vendor/symplify/coding-standard/src"
 		}
 	},
 	"prefer-stable": true,

composer.lock

@@ -29,6 +29,7 @@
 use Symplify\CodingStandard\Fixer\ArrayNotation\ArrayOpenerAndCloserNewlineFixer;
 use Symplify\CodingStandard\Fixer\Commenting\ParamReturnAndVarTagMalformsFixer;
 use Symplify\CodingStandard\Fixer\Strict\BlankLineAfterStrictTypesFixer;
+use SlevomatCodingStandard\Sniffs\Whitespaces\DuplicateSpacesSniff;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $containerConfigurator->import(__DIR__ . '/tools/03_ecs/vendor/symplify/easy-coding-standard/config/set/psr12.php');
@@ -73,6 +74,8 @@
 
     $services->set(SingleBlankLineBeforeNamespaceFixer::class);
 
+    $services->set(DuplicateSpacesSniff::class)->property('ignoreSpacesInAnnotation', true);
+
     $parameters = $containerConfigurator->parameters();
 
     $parameters->set('skip',

ecs.php

@@ -2,7 +2,7 @@
 
 <!-- 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/9.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.4/phpunit.xsd"
          backupGlobals="false"
          backupStaticAttributes="false"
          bootstrap="tests/bootstrap.php"

phpunit.xml.dist

@@ -35,7 +35,7 @@ class CreateApiKeyCommand extends Command
     use ApiKeyUserManagementHelper;
 
     /**
-     * @var array<int, array<string, int|string>>
+     * @var array<int, array<string, string>>
      */
     private static array $commandParameters = [
         [

src/Command/ApiKey/CreateApiKeyCommand.php

@@ -38,7 +38,7 @@ class CreateUserCommand extends Command
     private const PARAMETER_DESCRIPTION = 'description';
 
     /**
-     * @var array<int, array<string, int|string>>
+     * @var array<int, array<string, string>>
      */
     private static array $commandParameters = [
         [

src/Command/User/CreateUserCommand.php

@@ -35,7 +35,7 @@ class CreateUserGroupCommand extends Command
     use StyleSymfony;
 
     /**
-     * @var array<int, array<string, int|string>>
+     * @var array<int, array<string, string>>
      */
     private static array $commandParameters = [
         [

src/Command/User/CreateUserGroupCommand.php

@@ -31,7 +31,7 @@ abstract class RestDto implements RestDtoInterface
      *
      * And in that method make all necessary that you need to set that specified value.
      *
-     * @var mixed[]
+     * @var array<string, string>
      */
     protected static array $mappings = [];
 

src/DTO/RestDto.php

@@ -17,6 +17,10 @@ class EnumLanguageType extends EnumType
     public const LANGUAGE_RU = 'ru';
 
     protected static string $name = 'EnumLanguage';
+
+    /**
+     * @var array<int, string>
+     */
     protected static array $values = [
         self::LANGUAGE_EN,
         self::LANGUAGE_RU,