Upgrade/l10

.github/workflows/laravel.yml

@@ -2,9 +2,9 @@ name: Laravel
 
 on:
   push:
-    branches: [ 1.x, 2.x ]
+    branches: [ 2.x, 3.x ]
   pull_request:
-    branches: [ 1.x, 2.x ]
+    branches: [ 2.x, 3.x ]
 
 jobs:
   laravel:

composer.json

@@ -22,28 +22,28 @@
             "Seatplus\\Web\\Tests\\": "tests/"
         }
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "prefer-stable": true,
-  "require": {
+    "require": {
         "php": "^8.1",
-        "laravel/framework": "^9.0",
+        "laravel/framework": "^10.0",
         "laravel/socialite": "^5.0",
-        "seatplus/eveapi": "^2.0",
-        "seatplus/auth": "^2.0",
-        "inertiajs/inertia-laravel": "^0.5.4",
+        "seatplus/eveapi": "^3.0",
+        "seatplus/auth": "^3.0",
         "tightenco/ziggy": "^1.0.4",
         "spatie/laravel-permission": "^5.4",
         "spatie/data-transfer-object": "^3.7",
         "conedevelopment/i18n": "^1.1",
-        "doctrine/dbal": "^3.0"
+        "doctrine/dbal": "^3.0",
+        "inertiajs/inertia-laravel": "^0.6.9"
     },
     "require-dev": {
-        "orchestra/testbench": "^7.0",
-        "nunomaduro/collision": "^6.1",
-        "rector/rector": "^0.14.3",
-        "brianium/paratest": "^6.2",
-        "pestphp/pest": "^1.20",
-        "pestphp/pest-plugin-laravel": "^1.2"
+        "orchestra/testbench": "^8.0",
+        "nunomaduro/collision": "^7.0",
+        "rector/rector": "^0.15.21",
+        "driftingly/rector-laravel": "^0.17.0",
+        "pestphp/pest": "^2.0",
+        "pestphp/pest-plugin-laravel": "^2.0"
     },
     "extra": {
         "laravel": {

phpunit.xml

@@ -1,36 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Package Test Suite">
-            <directory suffix="Test.php">./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src/</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
-        <env name="REDIS_HOST" value="redis"/>
-        <env name="REDIS_PASSWORD" value="null"/>
-        <env name="REDIS_PORT" value="6379"/>
-        <env name="DB_HOST" value="127.0.0.1" />
-        <env name="DB_PORT" value="3308" />
-        <env name="DB_DATABASE" value="testbench" />
-        <env name="DB_USERNAME" value="default" />
-        <env name="DB_PASSWORD" value="secret" />
-    </php>
-    <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage>
+    <include>
+      <directory suffix=".php">./src/</directory>
+    </include>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Package Test Suite">
+      <directory suffix="Test.php">./tests/</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
+    <env name="REDIS_HOST" value="redis"/>
+    <env name="REDIS_PASSWORD" value="null"/>
+    <env name="REDIS_PORT" value="6379"/>
+    <env name="DB_HOST" value="127.0.0.1"/>
+    <env name="DB_PORT" value="3308"/>
+    <env name="DB_DATABASE" value="testbench"/>
+    <env name="DB_USERNAME" value="default"/>
+    <env name="DB_PASSWORD" value="secret"/>
+  </php>
+  <logging/>
 </phpunit>

rector.php

@@ -2,27 +2,36 @@
 
 declare(strict_types=1);
 
-use Rector\Core\Configuration\Option;
-use Rector\Laravel\Set\LaravelSetList;
-use Rector\Php74\Rector\Property\TypedPropertyRector;
-use Rector\Set\ValueObject\LevelSetList;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Rector\Config\RectorConfig;
+use Rector\Core\ValueObject\PhpVersion;
+use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
+use Rector\Php81\Rector\Array_\FirstClassCallableRector;
+use Rector\Set\ValueObject\SetList;
+use RectorLaravel\Set\LaravelSetList;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
-    // get parameters
-    $parameters = $containerConfigurator->parameters();
-    $parameters->set(Option::PATHS, [
-        __DIR__ . '/src',
-        __DIR__ . '/tests'
+return static function (RectorConfig $rectorConfig): void {
+    // here we can define, what sets of rules will be applied
+    // tip: use "SetList" class to autocomplete sets
+    $rectorConfig->sets([
+        //SetList::CODE_QUALITY,
+        LaravelSetList::LARAVEL_100,
+        LaravelSetList::LARAVEL_CODE_QUALITY,
+        SetList::PHP_81,
     ]);
+    // paths to refactor; solid alternative to CLI arguments
+    $rectorConfig->paths([__DIR__ . '/src', __DIR__ . '/tests']);
 
-    // Define what rule sets will be applied
-    $containerConfigurator->import(LevelSetList::UP_TO_PHP_80);
-    $containerConfigurator->import(LaravelSetList::LARAVEL_80);
+    // is your PHP version different from the one you refactor to? [default: your PHP version], uses PHP_VERSION_ID format
+    $rectorConfig->phpVersion(PhpVersion::PHP_81);
 
-    // get services (needed for register a single rule)
-    // $services = $containerConfigurator->services();
+    $rectorConfig->skip([
+        RemoveExtraParametersRector::class => [ __DIR__ . '/src/Services/SsoSettings/UpdateOrCreateSsoSettings.php'],
+        FirstClassCallableRector::class => [
+            __DIR__ . '/src/Http/Controllers/AccessControl/ControlGroupsController.php',
+            __DIR__ . '/src/Http/Controllers/Shared/ManualLocationController.php',
+    ]
+    ]);
 
-    // register a single rule
-    // $services->set(TypedPropertyRector::class);
+    // register single rule
+    //$rectorConfig->rule(TypedPropertyRector::class);
 };

src/Http/Actions/Wallet/GetRefTypesAction.php

@@ -59,7 +59,7 @@ private function getRefTypes(): Collection
 
     private function alphabetToNumber($string): float
     {
-        $string = strtoupper($string);
+        $string = strtoupper((string) $string);
         $length = strlen($string);
         $number = 0;
         $level = 1;

src/Http/Controllers/Corporation/MemberTracking/MemberTrackingController.php

@@ -91,8 +91,8 @@ private function getAffiliatedCorporations(object $dispatchTransferObject)
             ->get()
             ->map(function ($corporation) {
                 $corporation->required_scopes = collect([
-                    json_decode($corporation->corporation_scopes, true),
-                    json_decode($corporation->alliance_scopes, true),
+                    json_decode((string) $corporation->corporation_scopes, true),
+                    json_decode((string) $corporation->alliance_scopes, true),
                 ])->flatten()->filter()->unique()->toArray();
 
                 return $corporation;

src/Http/Controllers/Corporation/Recruitment/GetRecruitmentIndexController.php

@@ -35,8 +35,8 @@
 
 class GetRecruitmentIndexController extends Controller
 {
-    public const MANAGEPERMISSION = 'can open or close corporations for recruitment';
-    public const RECRUITERPERMISSION = 'can accept or deny applications';
+    final public const MANAGEPERMISSION = 'can open or close corporations for recruitment';
+    final public const RECRUITERPERMISSION = 'can accept or deny applications';
 
     public function __invoke()
     {

src/Http/Controllers/Queue/DispatchJobController.php

@@ -43,7 +43,7 @@ class DispatchJobController extends Controller
     protected array $dispatch_transfer_object;
 
     public function __construct(
-        private WebJobsRepository $web_jobs
+        private readonly WebJobsRepository $web_jobs
     ) {
     }
 

src/Services/ACL/SyncRoleAffiliations.php

@@ -37,12 +37,12 @@ class SyncRoleAffiliations
 {
     private $current_affiliations;
 
-    private \Illuminate\Support\Collection $target_affiliations;
+    private readonly \Illuminate\Support\Collection $target_affiliations;
 
     public function __construct(/**
      * @var \Seatplus\Auth\Models\Permissions\Role
      */
-        private Role $role
+        private readonly Role $role
     ) {
         $this->current_affiliations = $role->affiliations;
         $this->target_affiliations = collect();

src/Services/ACL/SyncRoleName.php

@@ -33,7 +33,7 @@ class SyncRoleName
     /**
      * SyncRoleName constructor.
      */
-    public function __construct(private Role $role)
+    public function __construct(private readonly Role $role)
     {
     }
 

src/Services/ACL/SyncRolePermissions.php

@@ -33,14 +33,14 @@
 
 class SyncRolePermissions
 {
-    private \Illuminate\Support\Collection $current_permissions;
+    private readonly \Illuminate\Support\Collection $current_permissions;
 
-    private \Illuminate\Support\Collection $target_permissions;
+    private readonly \Illuminate\Support\Collection $target_permissions;
 
     public function __construct(/**
      * @var \Seatplus\Auth\Models\Permissions\Role
      */
-        private Role $role
+        private readonly Role $role
     ) {
         $this->current_permissions = $role->permissions()->pluck('name');
         $this->target_permissions = collect();

src/Services/Affiliations/GetCorporationMemberComplianceAffiliatedIdsService.php

@@ -11,7 +11,7 @@
 class GetCorporationMemberComplianceAffiliatedIdsService
 {
     public function __construct(
-        private AffiliationsDto $affiliationsDto
+        private readonly AffiliationsDto $affiliationsDto
     ) {
     }
 

src/Services/Controller/CreateDispatchTransferObject.php

@@ -42,7 +42,7 @@
 
 class CreateDispatchTransferObject
 {
-    private array $transferObjectArray;
+    private readonly array $transferObjectArray;
 
     private bool $isCharacter = true;
 

src/Services/GetEntityFromId.php

@@ -33,13 +33,13 @@ class GetEntityFromId
 {
     private string $type;
 
-    private Collection $names;
+    private readonly Collection $names;
 
-    private GetNamesFromIdsService $get_names_from_ids_service;
+    private readonly GetNamesFromIdsService $get_names_from_ids_service;
 
-    private string $cache_key;
+    private readonly string $cache_key;
 
-    private ?array $cached_affiliation;
+    private readonly ?array $cached_affiliation;
 
     public function __construct(public int $id)
     {

src/Services/GetIdsFromNamesService.php

@@ -32,7 +32,7 @@
 
 class GetIdsFromNamesService
 {
-    private Collection $result;
+    private readonly Collection $result;
 
     public function __construct()
     {

src/Services/GetNamesFromIdsService.php

@@ -32,7 +32,7 @@
 
 class GetNamesFromIdsService
 {
-    private Collection $result;
+    private readonly Collection $result;
 
     public function __construct()
     {

src/Services/Mails/EveMailService.php

@@ -34,9 +34,9 @@
 
 class EveMailService
 {
-    private Collection $namesToResolve;
+    private readonly Collection $namesToResolve;
 
-    public function __construct(private Mail $mail)
+    public function __construct(private readonly Mail $mail)
     {
         $this->namesToResolve = collect();
     }