Merge pull request #1437 from tarlepp/feat/ecs-parallel

Feat/Run ECS tool parallel
tarlepp · Oct 1, 2021 · f38344c · f38344c
2 parents d421cd6 + 14a0843
commit f38344c
Show file tree

Hide file tree

Showing 64 changed files with 659 additions and 241 deletions.
diff --git a/.idea/symfony-flex-backend.iml b/.idea/symfony-flex-backend.iml
diff --git a/composer.json b/composer.json
@@ -113,7 +113,8 @@
 			],
 			"PhpCsFixer\\": "tools/04_symplify/vendor/symplify/easy-coding-standard/vendor/friendsofphp/php-cs-fixer/src",
 			"Symplify\\CodingStandard\\": "tools/04_symplify/vendor/symplify/easy-coding-standard/vendor/symplify/coding-standard/src",
-			"Symplify\\RuleDocGenerator\\": "tools/04_symplify/vendor/symplify/easy-coding-standard/vendor/symplify/rule-doc-generator-contracts/src",
+			"Symplify\\EasyCodingStandard\\": "tools/04_symplify/vendor/symplify/easy-coding-standard/src",
+			"ECSPrefix20210928\\Symplify\\RuleDocGenerator\\": "tools/04_symplify/vendor/symplify/easy-coding-standard/vendor/symplify/rule-doc-generator-contracts/src",
 			"PHPStan\\PhpDoc\\PHPUnit\\": "tools/02_phpstan/vendor/phpstan/phpstan-phpunit/src/PhpDoc/PHPUnit",
 			"PHPStan\\Rules\\PHPUnit\\": "tools/02_phpstan/vendor/phpstan/phpstan-phpunit/src/Rules/PHPUnit",
 			"PHPStan\\Symfony\\": "tools/02_phpstan/vendor/phpstan/phpstan-symfony/src/Symfony",

diff --git a/ecs.php b/ecs.php
@@ -11,7 +11,6 @@
 use PhpCsFixer\Fixer\ArrayNotation\NoMultilineWhitespaceAroundDoubleArrowFixer;
 use PhpCsFixer\Fixer\CastNotation\CastSpacesFixer;
 use PhpCsFixer\Fixer\ClassNotation\ClassAttributesSeparationFixer;
-use PhpCsFixer\Fixer\ConstantNotation\NativeConstantInvocationFixer;
 use PhpCsFixer\Fixer\ControlStructure\YodaStyleFixer;
 use PhpCsFixer\Fixer\FunctionNotation\NativeFunctionInvocationFixer;
 use PhpCsFixer\Fixer\FunctionNotation\SingleLineThrowFixer;
@@ -30,12 +29,9 @@
 use PhpCsFixer\Fixer\Phpdoc\PhpdocToCommentFixer;
 use PhpCsFixer\Fixer\PhpTag\BlankLineAfterOpeningTagFixer;
 use PhpCsFixer\Fixer\Whitespace\BlankLineBeforeStatementFixer;
-use PhpCsFixer\Fixer\Whitespace\HeredocIndentationFixer;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use Symplify\CodingStandard\Fixer\ArrayNotation\ArrayListItemNewlineFixer;
-use Symplify\CodingStandard\Fixer\ArrayNotation\ArrayOpenerAndCloserNewlineFixer;
-use Symplify\CodingStandard\Fixer\Commenting\ParamReturnAndVarTagMalformsFixer;
 use Symplify\CodingStandard\Fixer\Strict\BlankLineAfterStrictTypesFixer;
+use Symplify\EasyCodingStandard\ValueObject\Option;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $imports = [
@@ -173,14 +169,11 @@
             NotOperatorWithSuccessorSpaceFixer::class => null,
             SingleLineThrowFixer::class => null,
             BlankLineAfterStrictTypesFixer::class => null,
-            ParamReturnAndVarTagMalformsFixer::class => null,
-            ArrayOpenerAndCloserNewlineFixer::class => null,
-            ArrayListItemNewlineFixer::class => null,
             PhpdocAlignFixer::class => null,
-            HeredocIndentationFixer::class => null,
             PhpdocToCommentFixer::class => null,
             NativeFunctionInvocationFixer::class => null,
-            NativeConstantInvocationFixer::class => null,
         ]
     );
+
+    $parameters->set(Option::PARALLEL, true);
 };
diff --git a/src/Command/ApiKey/ApiKeyHelper.php b/src/Command/ApiKey/ApiKeyHelper.php
@@ -94,7 +94,12 @@ private function getApiKeyEntity(SymfonyStyle $io, string $question): ?ApiKey
     {
         $choices = [];
 
-        array_map($this->getApiKeyIterator($choices), $this->apiKeyResource->find(orderBy: ['token' => 'ASC']));
+        array_map(
+            $this->getApiKeyIterator($choices),
+            $this->apiKeyResource->find(orderBy: [
+                'token' => 'ASC',
+            ])
+        );
 
         $choices['Exit'] = 'Exit command';
 

diff --git a/src/Command/ApiKey/EditApiKeyCommand.php b/src/Command/ApiKey/EditApiKeyCommand.php
@@ -73,7 +73,14 @@ private function updateApiKey(InputInterface $input, OutputInterface $output, Ap
         $helper = $this->getHelper('form');
 
         /** @var ApiKeyDto $dtoEdit */
-        $dtoEdit = $helper->interactUsingForm(ApiKeyType::class, $input, $output, ['data' => $dtoLoaded]);
+        $dtoEdit = $helper->interactUsingForm(
+            ApiKeyType::class,
+            $input,
+            $output,
+            [
+                'data' => $dtoLoaded,
+            ]
+        );
 
         // Patch API key
         $this->apiKeyResource->patch($apiKey->getId(), $dtoEdit);

diff --git a/src/Command/ApiKey/ListApiKeysCommand.php b/src/Command/ApiKey/ListApiKeysCommand.php
@@ -72,7 +72,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
      */
     private function getRows(): array
     {
-        return array_map($this->getFormatterApiKey(), $this->apiKeyResource->find(orderBy: ['token' => 'ASC']));
+        return array_map(
+            $this->getFormatterApiKey(),
+            $this->apiKeyResource->find(orderBy: [
+                'token' => 'ASC',
+            ])
+        );
     }
 
     /**

diff --git a/src/Command/User/EditUserCommand.php b/src/Command/User/EditUserCommand.php
@@ -71,7 +71,14 @@ private function updateUser(InputInterface $input, OutputInterface $output, User
         $helper = $this->getHelper('form');
 
         /** @var UserDto $dtoEdit */
-        $dtoEdit = $helper->interactUsingForm(UserType::class, $input, $output, ['data' => $dtoLoaded]);
+        $dtoEdit = $helper->interactUsingForm(
+            UserType::class,
+            $input,
+            $output,
+            [
+                'data' => $dtoLoaded,
+            ]
+        );
 
         // Patch user
         $this->userResource->patch($user->getId(), $dtoEdit);

diff --git a/src/Command/User/EditUserGroupCommand.php b/src/Command/User/EditUserGroupCommand.php
@@ -74,7 +74,14 @@ protected function updateUserGroup(
         $helper = $this->getHelper('form');
 
         /** @var UserGroupDto $dtoEdit */
-        $dtoEdit = $helper->interactUsingForm(UserGroupType::class, $input, $output, ['data' => $dtoLoaded]);
+        $dtoEdit = $helper->interactUsingForm(
+            UserGroupType::class,
+            $input,
+            $output,
+            [
+                'data' => $dtoLoaded,
+            ]
+        );
 
         // Patch user group
         $this->userGroupResource->patch($userGroup->getId(), $dtoEdit);

diff --git a/src/Command/User/ListUserGroupsCommand.php b/src/Command/User/ListUserGroupsCommand.php
@@ -70,7 +70,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
      */
     private function getRows(): array
     {
-        return array_map($this->getFormatterUserGroup(), $this->userGroupResource->find(orderBy: ['name' => 'ASC']));
+        return array_map(
+            $this->getFormatterUserGroup(),
+            $this->userGroupResource->find(orderBy: [
+                'name' => 'ASC',
+            ])
+        );
     }
 
     /**

diff --git a/src/Command/User/ListUsersCommand.php b/src/Command/User/ListUsersCommand.php
@@ -74,7 +74,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
      */
     private function getRows(): array
     {
-        return array_map($this->getFormatterUser(), $this->userResource->find(orderBy: ['username' => 'ASC']));
+        return array_map(
+            $this->getFormatterUser(),
+            $this->userResource->find(orderBy: [
+                'username' => 'ASC',
+            ])
+        );
     }
 
     /**

diff --git a/src/Command/User/UserHelper.php b/src/Command/User/UserHelper.php
@@ -91,7 +91,12 @@ private function getUserEntity(SymfonyStyle $io, string $question): ?User
         $choices = [];
         $iterator = $this->getUserIterator($choices);
 
-        array_map($iterator, $this->userResource->find(orderBy: ['username' => 'asc']));
+        array_map(
+            $iterator,
+            $this->userResource->find(orderBy: [
+                'username' => 'asc',
+            ])
+        );
 
         $choices['Exit'] = 'Exit command';
 
@@ -109,7 +114,12 @@ private function getUserGroupEntity(SymfonyStyle $io, string $question): ?UserGr
         $choices = [];
         $iterator = $this->getUserGroupIterator($choices);
 
-        array_map($iterator, $this->userGroupResource->find(orderBy: ['name' => 'asc']));
+        array_map(
+            $iterator,
+            $this->userGroupResource->find(orderBy: [
+                'name' => 'asc',
+            ])
+        );
 
         $choices['Exit'] = 'Exit command';
 

diff --git a/src/Command/Utils/CheckDependencies.php b/src/Command/Utils/CheckDependencies.php
@@ -39,6 +39,7 @@
 use function sprintf;
 use function str_replace;
 use function strlen;
+use const DIRECTORY_SEPARATOR;
 
 /**
  * Class CheckDependencies

diff --git a/src/Controller/VersionController.php b/src/Controller/VersionController.php
@@ -46,6 +46,8 @@ public function __construct(
     )]
     public function __invoke(): JsonResponse
     {
-        return new JsonResponse(['version' => $this->version->get()]);
+        return new JsonResponse([
+            'version' => $this->version->get(),
+        ]);
     }
 }
diff --git a/src/Controller/v1/Profile/GroupsController.php b/src/Controller/v1/Profile/GroupsController.php
@@ -96,7 +96,9 @@ public function __invoke(User $loggedInUser): JsonResponse
             $this->serializer->serialize(
                 $loggedInUser->getUserGroups()->toArray(),
                 'json',
-                ['groups' => UserGroup::SET_USER_PROFILE_GROUPS],
+                [
+                    'groups' => UserGroup::SET_USER_PROFILE_GROUPS,
+                ],
             ),
             json: true,
         );

diff --git a/src/Controller/v1/Profile/IndexController.php b/src/Controller/v1/Profile/IndexController.php
@@ -84,7 +84,13 @@ public function __invoke(User $loggedInUser): JsonResponse
     {
         /** @var array<string, string|array<string, string>> $output */
         $output = JSON::decode(
-            $this->serializer->serialize($loggedInUser, 'json', ['groups' => User::SET_USER_PROFILE]),
+            $this->serializer->serialize(
+                $loggedInUser,
+                'json',
+                [
+                    'groups' => User::SET_USER_PROFILE,
+                ]
+            ),
             true,
         );
 

diff --git a/src/Controller/v1/Role/FindOneRoleController.php b/src/Controller/v1/Role/FindOneRoleController.php
@@ -41,7 +41,9 @@ public function __construct(
      */
     #[Route(
         path: '/v1/role/{role}',
-        requirements: ['role' => '^ROLE_\w+$'],
+        requirements: [
+            'role' => '^ROLE_\w+$',
+        ],
         methods: [Request::METHOD_GET],
     )]
     #[IsGranted(AuthenticatedVoter::IS_AUTHENTICATED_FULLY)]

diff --git a/src/Controller/v1/Role/InheritedRolesController.php b/src/Controller/v1/Role/InheritedRolesController.php
@@ -74,7 +74,9 @@ public function __construct(
      */
     #[Route(
         path: '/v1/role/{role}/inherited',
-        requirements: ['role' => '^ROLE_\w+$'],
+        requirements: [
+            'role' => '^ROLE_\w+$',
+        ],
         methods: [Request::METHOD_GET],
     )]
     #[IsGranted(AuthenticatedVoter::IS_AUTHENTICATED_FULLY)]

diff --git a/src/EventSubscriber/ResponseSubscriber.php b/src/EventSubscriber/ResponseSubscriber.php
@@ -46,6 +46,8 @@ public static function getSubscribedEvents(): array
     public function onKernelResponse(ResponseEvent $event): void
     {
         // Attach new header
-        $event->getResponse()->headers->add(['X-API-VERSION' => $this->version->get()]);
+        $event->getResponse()->headers->add([
+            'X-API-VERSION' => $this->version->get(),
+        ]);
     }
 }
diff --git a/src/Repository/BaseRepository.php b/src/Repository/BaseRepository.php
@@ -123,7 +123,10 @@ public function remove(EntityInterface $entity, ?bool $flush = null): self
     public function processQueryBuilder(QueryBuilder $queryBuilder): void
     {
         // Reset processed joins and callbacks
-        self::$processedJoins = [self::INNER_JOIN => [], self::LEFT_JOIN => []];
+        self::$processedJoins = [
+            self::INNER_JOIN => [],
+            self::LEFT_JOIN => [],
+        ];
         self::$processedCallbacks = [];
 
         $this->processJoins($queryBuilder);

diff --git a/src/Rest/ResponseHandler.php b/src/Rest/ResponseHandler.php
@@ -95,7 +95,9 @@ public function getSerializeContext(Request $request, ?RestResourceInterface $re
         }
 
         return array_merge(
-            ['groups' => $groups],
+            [
+                'groups' => $groups,
+            ],
             $restResource !== null ? $restResource->getSerializerContext() : [],
         );
     }

diff --git a/src/Rest/Traits/Methods/CountMethod.php b/src/Rest/Traits/Methods/CountMethod.php
@@ -42,7 +42,13 @@ public function countMethod(Request $request, ?array $allowedHttpMethods = null)
 
             return $this
                 ->getResponseHandler()
-                ->createResponse($request, ['count' => $resource->count($criteria, $search)], $resource);
+                ->createResponse(
+                    $request,
+                    [
+                        'count' => $resource->count($criteria, $search),
+                    ],
+                    $resource
+                );
         } catch (Throwable $exception) {
             throw $this->handleRestMethodException($exception);
         }

diff --git a/src/Security/Provider/ApiKeyUserProvider.php b/src/Security/Provider/ApiKeyUserProvider.php
@@ -55,7 +55,9 @@ public function refreshUser(UserInterface $user): UserInterface
 
     public function getApiKeyForToken(string $token): ?ApiKey
     {
-        return $this->apiKeyRepository->findOneBy(['token' => $token]);
+        return $this->apiKeyRepository->findOneBy([
+            'token' => $token,
+        ]);
     }
 
     /**

diff --git a/src/Utils/Tests/Auth.php b/src/Utils/Tests/Auth.php
@@ -25,6 +25,7 @@
 use function sprintf;
 use function str_pad;
 use function sys_get_temp_dir;
+use const DIRECTORY_SEPARATOR;
 
 /**
  * Class Auth
@@ -137,7 +138,10 @@ private function getToken(string $username, string $password): string
                         'HTTP_X-Requested-With' => 'XMLHttpRequest',
                     ]
                 ),
-                JSON::encode(['username' => $username, 'password' => $password])
+                JSON::encode([
+                    'username' => $username,
+                    'password' => $password,
+                ])
             );
 
             $response = $client->getResponse();

diff --git a/src/Utils/Tests/WebTestCase.php b/src/Utils/Tests/WebTestCase.php
@@ -77,7 +77,15 @@ public function getTestClient(
 
         self::ensureKernelShutdown();
 
-        return static::createClient(array_merge($options, ['debug' => false]), $server);
+        return static::createClient(
+            array_merge(
+                $options,
+                [
+                    'debug' => false,
+                ]
+            ),
+            $server
+        );
     }
 
     /**
@@ -96,7 +104,9 @@ public function getApiKeyClient(?string $role = null, ?array $options = null, ?a
         // Merge authorization headers
         $server = array_merge(
             $role === null
-                ? ['HTTP_AUTHORIZATION' => 'ApiKey invalid-api-key']
+                ? [
+                    'HTTP_AUTHORIZATION' => 'ApiKey invalid-api-key',
+                ]
                 : $authService->getAuthorizationHeadersForApiKey($role),
             array_merge($this->getJsonHeaders(), $this->getFastestHeaders()),
             $authService->getJwtHeaders(),

diff --git a/tests/E2E/Rest/ResourceLifeCycleTest.php b/tests/E2E/Rest/ResourceLifeCycleTest.php
@@ -37,7 +37,9 @@ public function testThatModifiedEntityIsNotFlushedIfLifeCycleMethodThrowsAnExcep
         $client->request('GET', '/test_lifecycle_behaviour/' . $role);
 
         $response = $client->getResponse();
-        $entity = $this->getRepository()->findOneBy(['id' => $role]);
+        $entity = $this->getRepository()->findOneBy([
+            'id' => $role,
+        ]);
 
         static::assertNotNull($entity, sprintf('Role entity for id `%s` not found...', $role));
         static::assertSame(418, $response->getStatusCode(), (string)$response->getContent());