Merge pull request #2279 from tarlepp/feat/rector-changes

Feat - Rector changes to code base
tarlepp · Apr 23, 2023 · e0a5eaf · e0a5eaf
2 parents 9c9ace6 + e216fa8
commit e0a5eaf
Show file tree

Hide file tree

Showing 45 changed files with 98 additions and 81 deletions.
diff --git a/src/Command/ApiKey/ChangeTokenCommand.php b/src/Command/ApiKey/ChangeTokenCommand.php
@@ -31,7 +31,7 @@ class ChangeTokenCommand extends Command
 {
     use SymfonyStyleTrait;
 
-    public const NAME = 'api-key:change-token';
+    final public const NAME = 'api-key:change-token';
 
     public function __construct(
         private readonly ApiKeyResource $apiKeyResource,

diff --git a/src/Command/ApiKey/CreateApiKeyCommand.php b/src/Command/ApiKey/CreateApiKeyCommand.php
@@ -40,7 +40,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>>

diff --git a/src/Command/ApiKey/EditApiKeyCommand.php b/src/Command/ApiKey/EditApiKeyCommand.php
@@ -34,7 +34,7 @@ class EditApiKeyCommand extends Command
 {
     use SymfonyStyleTrait;
 
-    public const NAME = 'api-key:edit';
+    final public const NAME = 'api-key:edit';
 
     public function __construct(
         private readonly ApiKeyResource $apiKeyResource,

diff --git a/src/Command/ApiKey/ListApiKeysCommand.php b/src/Command/ApiKey/ListApiKeysCommand.php
@@ -35,7 +35,7 @@
 )]
 class ListApiKeysCommand extends Command
 {
-    public const NAME = 'api-key:list';
+    final public const NAME = 'api-key:list';
 
     public function __construct(
         private readonly ApiKeyResource $apiKeyResource,

diff --git a/src/Command/ApiKey/RemoveApiKeyCommand.php b/src/Command/ApiKey/RemoveApiKeyCommand.php
@@ -31,7 +31,7 @@ class RemoveApiKeyCommand extends Command
 {
     use SymfonyStyleTrait;
 
-    public const NAME = 'api-key:remove';
+    final public const NAME = 'api-key:remove';
 
     public function __construct(
         private readonly ApiKeyResource $apiKeyResource,

diff --git a/src/Command/User/CreateRolesCommand.php b/src/Command/User/CreateRolesCommand.php
@@ -36,7 +36,7 @@ class CreateRolesCommand extends Command
 {
     use SymfonyStyleTrait;
 
-    public const NAME = 'user:create-roles';
+    final public const NAME = 'user:create-roles';
 
     public function __construct(
         private readonly EntityManagerInterface $entityManager,

diff --git a/src/Command/User/CreateUserCommand.php b/src/Command/User/CreateUserCommand.php
@@ -40,7 +40,7 @@ class CreateUserCommand extends Command
     use ApiKeyUserManagementHelperTrait;
     use SymfonyStyleTrait;
 
-    public const NAME = 'user:create';
+    final public const NAME = 'user:create';
 
     private const PARAMETER_NAME = 'name';
     private const PARAMETER_DESCRIPTION = 'description';

diff --git a/src/Command/User/CreateUserGroupCommand.php b/src/Command/User/CreateUserGroupCommand.php
@@ -39,7 +39,7 @@ class CreateUserGroupCommand extends Command
     use GetApplicationTrait;
     use SymfonyStyleTrait;
 
-    public const NAME = 'user:create-group';
+    final public const NAME = 'user:create-group';
 
     /**
      * @var array<int, array<string, string>>

diff --git a/src/Command/User/EditUserCommand.php b/src/Command/User/EditUserCommand.php
@@ -34,7 +34,7 @@ class EditUserCommand extends Command
 {
     use SymfonyStyleTrait;
 
-    public const NAME = 'user:edit';
+    final public const NAME = 'user:edit';
 
     public function __construct(
         private readonly UserResource $userResource,

diff --git a/src/Command/User/EditUserGroupCommand.php b/src/Command/User/EditUserGroupCommand.php
@@ -34,7 +34,7 @@ class EditUserGroupCommand extends Command
 {
     use SymfonyStyleTrait;
 
-    public const NAME = 'user:edit-group';
+    final public const NAME = 'user:edit-group';
 
     public function __construct(
         private readonly UserGroupResource $userGroupResource,

diff --git a/src/Command/User/ListUserGroupsCommand.php b/src/Command/User/ListUserGroupsCommand.php
@@ -36,7 +36,7 @@ class ListUserGroupsCommand extends Command
 {
     use SymfonyStyleTrait;
 
-    public const NAME = 'user:list-groups';
+    final public const NAME = 'user:list-groups';
 
     public function __construct(
         private readonly UserGroupResource $userGroupResource,

diff --git a/src/Command/User/ListUsersCommand.php b/src/Command/User/ListUsersCommand.php
@@ -37,7 +37,7 @@ class ListUsersCommand extends Command
 {
     use SymfonyStyleTrait;
 
-    public const NAME = 'user:list';
+    final public const NAME = 'user:list';
 
     public function __construct(
         private readonly UserResource $userResource,

diff --git a/src/Command/User/RemoveUserCommand.php b/src/Command/User/RemoveUserCommand.php
@@ -31,7 +31,7 @@ class RemoveUserCommand extends Command
 {
     use SymfonyStyleTrait;
 
-    public const NAME = 'user:remove';
+    final public const NAME = 'user:remove';
 
     public function __construct(
         private readonly UserResource $userResource,

diff --git a/src/Command/User/RemoveUserGroupCommand.php b/src/Command/User/RemoveUserGroupCommand.php
@@ -31,7 +31,7 @@ class RemoveUserGroupCommand extends Command
 {
     use SymfonyStyleTrait;
 
-    public const NAME = 'user:remove-group';
+    final public const NAME = 'user:remove-group';
 
     public function __construct(
         private readonly UserGroupResource $userGroupResource,

diff --git a/src/Doctrine/DBAL/Types/EnumLogLoginType.php b/src/Doctrine/DBAL/Types/EnumLogLoginType.php
@@ -16,8 +16,8 @@
  */
 class EnumLogLoginType extends EnumType
 {
-    public const TYPE_FAILURE = 'failure';
-    public const TYPE_SUCCESS = 'success';
+    final public const TYPE_FAILURE = 'failure';
+    final public const TYPE_SUCCESS = 'success';
 
     protected static string $name = Types::ENUM_LOG_LOGIN;
 

diff --git a/src/Doctrine/DBAL/Types/Types.php b/src/Doctrine/DBAL/Types/Types.php
@@ -16,7 +16,7 @@
  */
 class Types
 {
-    public const ENUM_LANGUAGE = 'EnumLanguage';
-    public const ENUM_LOCALE = 'EnumLocale';
-    public const ENUM_LOG_LOGIN = 'EnumLogLogin';
+    final public const ENUM_LANGUAGE = 'EnumLanguage';
+    final public const ENUM_LOCALE = 'EnumLocale';
+    final public const ENUM_LOG_LOGIN = 'EnumLogLogin';
 }
diff --git a/src/Doctrine/DBAL/Types/UTCDateTimeType.php b/src/Doctrine/DBAL/Types/UTCDateTimeType.php
@@ -25,7 +25,7 @@
  */
 class UTCDateTimeType extends DateTimeType
 {
-    private static ?DateTimeZone $utc;
+    private static ?DateTimeZone $utc = null;
 
     /**
      * {@inheritdoc}

diff --git a/src/Entity/ApiKey.php b/src/Entity/ApiKey.php
@@ -27,7 +27,6 @@
 use Symfony\Component\Validator\Constraints as Assert;
 use Throwable;
 use function array_map;
-use function array_merge;
 use function array_unique;
 use function array_values;
 
@@ -214,12 +213,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(),
-                    ),
+                    ],
                 ),
             ),
         );

diff --git a/src/Entity/LogLogin.php b/src/Entity/LogLogin.php
@@ -226,8 +226,6 @@ class LogLogin implements EntityInterface
     ])]
     private ?string $model = null;
 
-    private DeviceDetector $deviceDetector;
-
     /**
      * LogLogin constructor.
      *
@@ -242,9 +240,9 @@ public function __construct(
             'LogLogin',
             'LogLogin.type',
         ])]
-        private string $type,
+        private readonly string $type,
         Request $request,
-        DeviceDetector $deviceDetector,
+        private readonly DeviceDetector $deviceDetector,
         #[ORM\ManyToOne(
             targetEntity: User::class,
             inversedBy: 'logsLogin',
@@ -261,8 +259,6 @@ public function __construct(
     ) {
         $this->id = $this->createUuid();
 
-        $this->deviceDetector = $deviceDetector;
-
         $this->processTimeAndDate();
         $this->processRequestData($request);
         $this->processClientData();

diff --git a/src/Entity/User.php b/src/Entity/User.php
@@ -62,8 +62,8 @@ class User implements EntityInterface, UserInterface, UserGroupAwareInterface
     use UserRelations;
     use Uuid;
 
-    public const SET_USER_PROFILE = 'set.UserProfile';
-    public const SET_USER_BASIC = 'set.UserBasic';
+    final public const SET_USER_PROFILE = 'set.UserProfile';
+    final public const SET_USER_BASIC = 'set.UserBasic';
 
     /**
      * @OA\Property(type="string", format="uuid")

diff --git a/src/Entity/UserGroup.php b/src/Entity/UserGroup.php
@@ -40,8 +40,8 @@ class UserGroup implements EntityInterface, Stringable
     use Timestampable;
     use Uuid;
 
-    public const SET_USER_PROFILE_GROUPS = 'set.UserProfileGroups';
-    public const SET_USER_GROUP_BASIC = 'set.UserGroupBasic';
+    final public const SET_USER_PROFILE_GROUPS = 'set.UserProfileGroups';
+    final public const SET_USER_GROUP_BASIC = 'set.UserGroupBasic';
 
     /**
      * @OA\Property(type="string", format="uuid")

diff --git a/src/EventSubscriber/AcceptLanguageSubscriber.php b/src/EventSubscriber/AcceptLanguageSubscriber.php
@@ -22,10 +22,10 @@
 class AcceptLanguageSubscriber implements EventSubscriberInterface
 {
     // Supported locales
-    public const LOCALE_EN = 'en';
-    public const LOCALE_FI = 'fi';
+    final public const LOCALE_EN = 'en';
+    final public const LOCALE_FI = 'fi';
 
-    public const SUPPORTED_LOCALES = [
+    final public const SUPPORTED_LOCALES = [
         self::LOCALE_EN,
         self::LOCALE_FI,
     ];

diff --git a/src/Form/Type/Traits/AddBasicFieldToForm.php b/src/Form/Type/Traits/AddBasicFieldToForm.php
@@ -25,7 +25,7 @@ trait AddBasicFieldToForm
     protected function addBasicFieldToForm(FormBuilderInterface $builder, array $fields): void
     {
         foreach ($fields as $params) {
-            call_user_func_array([$builder, 'add'], $params);
+            call_user_func_array($builder->add(...), $params);
         }
     }
 }
diff --git a/src/Helpers/LoggerAwareTrait.php b/src/Helpers/LoggerAwareTrait.php
@@ -23,7 +23,7 @@
  */
 trait LoggerAwareTrait
 {
-    protected ?LoggerInterface $logger;
+    protected ?LoggerInterface $logger = null;
 
     #[Required]
     public function setLogger(LoggerInterface $logger): self

diff --git a/src/Helpers/StopwatchAwareTrait.php b/src/Helpers/StopwatchAwareTrait.php
@@ -23,7 +23,7 @@
  */
 trait StopwatchAwareTrait
 {
-    protected ?Stopwatch $stopwatch;
+    protected ?Stopwatch $stopwatch = null;
 
     #[Required]
     public function setStopwatch(Stopwatch $stopwatch): self

diff --git a/src/Repository/BaseRepository.php b/src/Repository/BaseRepository.php
@@ -17,7 +17,6 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
 use function array_map;
-use function array_merge;
 use function array_unshift;
 use function implode;
 use function in_array;
@@ -157,7 +156,7 @@ public function addInnerJoin(array $parameters): self
     public function addCallback(callable $callable, ?array $args = null): self
     {
         $args ??= [];
-        $hash = sha1(serialize(array_merge([spl_object_hash((object)$callable)], $args)));
+        $hash = sha1(serialize([spl_object_hash((object)$callable), ...$args]));
 
         if (!in_array($hash, self::$processedCallbacks, true)) {
             self::$callbacks[] = [$callable, $args];

diff --git a/src/Repository/UserRepository.php b/src/Repository/UserRepository.php
@@ -49,7 +49,7 @@ class UserRepository extends BaseRepository
     public function __construct(
         protected ManagerRegistry $managerRegistry,
         #[Autowire('%kernel.environment%')]
-        private string $environment,
+        private readonly string $environment,
     ) {
     }
 

diff --git a/src/Rest/RepositoryHelper.php b/src/Rest/RepositoryHelper.php
@@ -320,7 +320,7 @@ private static function determineComparisonAndParameters(QueryBuilder $queryBuil
         // Initialize used callback parameters
         $parameters = [$comparisonObject->field];
 
-        $lowercaseOperator = strtolower($comparisonObject->operator);
+        $lowercaseOperator = strtolower((string)$comparisonObject->operator);
 
         if ($lowercaseOperator !== 'isnull' && $lowercaseOperator !== 'isnotnull') {
             $parameters = self::getComparisonParameters(

diff --git a/src/Rest/RequestHandler.php b/src/Rest/RequestHandler.php
@@ -27,7 +27,7 @@
 use function is_string;
 use function mb_strtoupper;
 use function mb_substr;
-use function strncmp;
+use function str_starts_with;
 
 /**
  * Class RequestHandler
@@ -266,7 +266,7 @@ private static function getIterator(array &$output): Closure
             $order = in_array(mb_strtoupper($value), ['ASC', 'DESC'], true) ? mb_strtoupper($value) : 'ASC';
             $column = is_string($key) ? $key : $value;
 
-            if (strncmp($column, '-', 1) === 0) {
+            if (str_starts_with($column, '-')) {
                 $column = mb_substr($column, 1);
                 $order = 'DESC';
             }

diff --git a/src/Rest/ResponseHandler.php b/src/Rest/ResponseHandler.php
@@ -27,7 +27,7 @@
 use function explode;
 use function implode;
 use function sprintf;
-use function strncmp;
+use function str_starts_with;
 
 /**
  * Class ResponseHandler
@@ -85,8 +85,8 @@ public function getSerializeContext(Request $request, ?RestResourceInterface $re
                 $restResource
             );
 
-            $groups = array_merge([$entityName], $populate);
-            $filter = static fn (string $groupName): bool => strncmp($groupName, 'Set.', 4) === 0;
+            $groups = [$entityName, ...$populate];
+            $filter = static fn (string $groupName): bool => str_starts_with($groupName, 'Set.');
 
             if (array_key_exists('populateOnly', $request->query->all())
                 || array_values(array_filter($groups, $filter)) !== []

diff --git a/src/Security/ApiKeyUser.php b/src/Security/ApiKeyUser.php
@@ -12,7 +12,6 @@
 use App\Enum\Role;
 use App\Security\Interfaces\ApiKeyUserInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
-use function array_merge;
 use function array_unique;
 
 /**
@@ -23,13 +22,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}
@@ -38,7 +37,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

diff --git a/src/Security/SecurityUser.php b/src/Security/SecurityUser.php
@@ -22,11 +22,11 @@
  */
 class SecurityUser implements UserInterface, PasswordAuthenticatedUserInterface
 {
-    private string $identifier;
-    private string | null $password;
-    private Language $language;
-    private Locale $locale;
-    private string $timezone;
+    private readonly string $identifier;
+    private readonly string | null $password;
+    private readonly Language $language;
+    private readonly Locale $locale;
+    private readonly string $timezone;
 
     /**
      * SecurityUser constructor.