[PLA-1678] Laravel 11 update.

.github/workflows/run_tests.yml

@@ -43,7 +43,7 @@ jobs:
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, gmp, intl, json, mysql, readline, sodium, bcmath, pcov
           tools: composer:v2
         env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup GO
         uses: actions/setup-go@v5
@@ -62,7 +62,7 @@ jobs:
           chmod 600 ~/.ssh/id_rsa
           composer install --no-interaction --prefer-dist --optimize-autoloader
           composer build-sr25519
-          composer dumpautoload
+          composer dump-autoload
 
       - name: Run Laravel Pint
         run: |

composer.json

@@ -19,13 +19,13 @@
         }
     ],
     "require": {
-        "php": "^8.1|^8.2",
+        "php": "^8.2",
         "ext-bcmath": "*",
         "ext-json": "*",
         "ext-openssl": "*",
         "enjin/platform-core": "*",
         "phrity/websocket": "^1.0",
-        "rebing/graphql-laravel": "^9.0.0-rc1",
+        "rebing/graphql-laravel": "^9.2",
         "spatie/laravel-package-tools": "^1.0",
         "spatie/laravel-ray": "^1.0"
     },
@@ -73,9 +73,9 @@
     "require-dev": {
         "dms/phpunit-arraysubset-asserts": "dev-master",
         "laravel/pint": "^1.16",
-        "nunomaduro/collision": "^7.0",
-        "nunomaduro/larastan": "^2.0",
-        "orchestra/testbench": "^8.0",
+        "nunomaduro/collision": "^8.1",
+        "larastan/larastan": "^2.0",
+        "orchestra/testbench": "^9.0",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",

database/migrations/2022_10_11_141639_create_beam_batches_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class() extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2022_10_12_115527_create_beams_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class() extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2022_10_12_115558_create_beam_claims_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class() extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2022_10_17_143652_create_beam_scans_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class() extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2023_06_27_014433_add_collection_chain_id_to_beam_batches_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class() extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2024_02_26_013401_add_idempotency_key_to_beam_claims_table.php

@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class() extends Migration
+{
     /**
      * Run the migrations.
      */

phpunit.xml

@@ -24,7 +24,7 @@
   <php>
     <env name="APP_KEY" value="base64:2fl+Ktvkfl+Fuz4Qp/A75G2RTiWVA/ZoKZvp6fiiM10="/>
     <env name="DB_CONNECTION" value="mysql"/>
-    <env name="CACHE_DRIVER" value="redis"/>
+    <env name="CACHE_STORE" value="redis"/>
     <env name="CHAIN" value="substrate"/>
     <env name="NETWORK" value="local"/>
     <env name="DAEMON_ACCOUNT" value="0x6a03b1a3d40d7e344dfb27157931b14b59fe2ff11d7352353321fe400e956802"/>

src/BeamServiceProvider.php

@@ -70,12 +70,12 @@ public function boot()
     {
         parent::boot();
 
-        $this->loadMigrationsFrom(__DIR__ . '/../database/migrations');
-        $this->loadRoutesFrom(__DIR__ . '/../routes/enjin-platform-beam.php');
+        $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
+        $this->loadRoutesFrom(__DIR__.'/../routes/enjin-platform-beam.php');
     }
 
     public function packageRegistered()
     {
-        $this->loadTranslationsFrom(__DIR__ . '/../lang', 'enjin-platform-beam');
+        $this->loadTranslationsFrom(__DIR__.'/../lang', 'enjin-platform-beam');
     }
 }

src/Channels/PlatformBeamChannel.php

@@ -12,6 +12,6 @@ class PlatformBeamChannel extends PlatformAppChannel
     public function __construct()
     {
         parent::__construct();
-        $this->name = 'beam;' . $this->name;
+        $this->name = 'beam;'.$this->name;
     }
 }

src/Commands/BatchProcess.php

@@ -123,10 +123,10 @@ protected function process(): void
         $this->info("Total batch completed: {$total}");
 
         $transferedCount = $this->processBatch(BeamType::TRANSFER_TOKEN);
-        $this->info('Total transfers completed: ' . $transferedCount);
+        $this->info('Total transfers completed: '.$transferedCount);
 
         $mintedCount = $this->processBatch(BeamType::MINT_ON_DEMAND);
-        $this->info('Total mints completed: ' . $mintedCount);
+        $this->info('Total mints completed: '.$mintedCount);
     }
 
     /**
@@ -164,7 +164,7 @@ protected function processBatch(BeamType $type): int
                             ])->toEncodable(),
                         ];
                     } else {
-                        $key = $claim->token_chain_id . '|' . $claim->collection_id;
+                        $key = $claim->token_chain_id.'|'.$claim->collection_id;
                         if (isset($createdTokens[$key])) {
                             // Succeeding claims should be minted. Reassigning claims to the next batch
                             $claim->update(['beam_batch_id' => $batchId = $this->batch->getNextBatchId($type, $collectionId)]);

src/Enums/PlatformBeamCache.php

@@ -21,7 +21,7 @@ enum PlatformBeamCache: string implements PlatformCacheable
      */
     public function key(?string $suffix = null): string
     {
-        return 'enjin-platform:beam:' . $this->value . ($suffix ? ":{$suffix}" : '');
+        return 'enjin-platform:beam:'.$this->value.($suffix ? ":{$suffix}" : '');
     }
 
     /**

src/Events/BeamClaimInProgress.php

@@ -2,6 +2,4 @@
 
 namespace Enjin\Platform\Beam\Events;
 
-class BeamClaimInProgress extends BeamClaimPending
-{
-}
+class BeamClaimInProgress extends BeamClaimPending {}

src/Events/BeamClaimPending.php

@@ -30,7 +30,7 @@ public function __construct(array $claim)
         );
 
         $this->broadcastChannels = [
-            new Channel('collection;' . $claim['beam']['collection_chain_id']),
+            new Channel('collection;'.$claim['beam']['collection_chain_id']),
             new PlatformAppChannel(),
             new PlatformBeamChannel(),
         ];

src/Events/BeamClaimsComplete.php

@@ -2,6 +2,4 @@
 
 namespace Enjin\Platform\Beam\Events;
 
-class BeamClaimsComplete extends BeamClaimPending
-{
-}
+class BeamClaimsComplete extends BeamClaimPending {}

src/Events/BeamClaimsFailed.php

@@ -2,6 +2,4 @@
 
 namespace Enjin\Platform\Beam\Events;
 
-class BeamClaimsFailed extends BeamClaimPending
-{
-}
+class BeamClaimsFailed extends BeamClaimPending {}

src/Events/BeamDeleted.php

@@ -2,6 +2,4 @@
 
 namespace Enjin\Platform\Beam\Events;
 
-class BeamDeleted extends BeamCreated
-{
-}
+class BeamDeleted extends BeamCreated {}

src/Events/BeamUpdated.php

@@ -2,6 +2,4 @@
 
 namespace Enjin\Platform\Beam\Events;
 
-class BeamUpdated extends BeamCreated
-{
-}
+class BeamUpdated extends BeamCreated {}

src/Events/TokensRemoved.php

@@ -2,6 +2,4 @@
 
 namespace Enjin\Platform\Beam\Events;
 
-class TokensRemoved extends TokensAdded
-{
-}
+class TokensRemoved extends TokensAdded {}

src/GraphQL/Traits/HasBeamCommonFields.php

@@ -14,23 +14,23 @@ public function getCommonFields(array $exclude = [], bool $updating = false): ar
         $required = $updating ? '' : '!';
         $fields = [
             'name' => [
-                'type' => GraphQL::type('String' . $required),
+                'type' => GraphQL::type('String'.$required),
                 'description' => __('enjin-platform-beam::mutation.common.args.name'),
             ],
             'description' => [
-                'type' => GraphQL::type('String' . $required),
+                'type' => GraphQL::type('String'.$required),
                 'description' => __('enjin-platform-beam::mutation.common.args.description'),
             ],
             'image' => [
-                'type' => GraphQL::type('String' . $required),
+                'type' => GraphQL::type('String'.$required),
                 'description' => __('enjin-platform-beam::mutation.common.args.image'),
             ],
             'start' => [
-                'type' => GraphQL::type('DateTime' . $required),
+                'type' => GraphQL::type('DateTime'.$required),
                 'description' => __('enjin-platform-beam::mutation.common.args.start'),
             ],
             'end' => [
-                'type' => GraphQL::type('DateTime' . $required),
+                'type' => GraphQL::type('DateTime'.$required),
                 'description' => __('enjin-platform-beam::mutation.common.args.end'),
             ],
         ];

src/Jobs/ClaimBeam.php

@@ -33,9 +33,7 @@ class ClaimBeam implements ShouldQueue
     /**
      * Create a new job instance.
      */
-    public function __construct(protected ?array $data)
-    {
-    }
+    public function __construct(protected ?array $data) {}
 
     /**
      * Execute the job.
@@ -68,7 +66,7 @@ public function handle(BatchService $batch, WalletService $wallet): void
             } catch (Throwable $e) {
                 DB::rollBack();
 
-                Log::error('ClaimBeamJob: Claim error, message:' . $e->getMessage(), $data);
+                Log::error('ClaimBeamJob: Claim error, message:'.$e->getMessage(), $data);
 
                 throw $e;
             } finally {

src/Jobs/CreateBeamClaims.php

@@ -22,9 +22,7 @@ class CreateBeamClaims implements ShouldQueue
     /**
      * Create a new job instance.
      */
-    public function __construct(protected ?Collection $chunk)
-    {
-    }
+    public function __construct(protected ?Collection $chunk) {}
 
     /**
      * Execute the job.

src/Jobs/CreateClaim.php

@@ -21,9 +21,7 @@ class CreateClaim implements ShouldQueue
     /**
      * Create a new job instance.
      */
-    public function __construct(protected ?array $claim)
-    {
-    }
+    public function __construct(protected ?array $claim) {}
 
     /**
      * Execute the job.

src/Jobs/DispatchCreateBeamClaimsJobs.php

@@ -26,8 +26,7 @@ class DispatchCreateBeamClaimsJobs implements ShouldQueue
     public function __construct(
         protected Model $beam,
         protected ?array $tokens
-    ) {
-    }
+    ) {}
 
     /**
      * Execute the job.

src/Listeners/UpdateClaimCollectionIds.php

@@ -8,9 +8,7 @@
 
 class UpdateClaimCollectionIds implements ShouldQueue
 {
-    public function __construct(private readonly BeamClaimService $beamClaimService)
-    {
-    }
+    public function __construct(private readonly BeamClaimService $beamClaimService) {}
 
     /**
      * Handle the event.

src/Listeners/UpdateClaimStatus.php

@@ -18,9 +18,7 @@ class UpdateClaimStatus implements ShouldQueue
     /**
      * Create new event listener instance.
      */
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     /**
      * Handle the event.

src/Models/Beam.php

@@ -4,6 +4,4 @@
 
 use Enjin\Platform\Models\ModelResolver;
 
-class Beam extends ModelResolver
-{
-}
+class Beam extends ModelResolver {}

src/Models/BeamBatch.php

@@ -4,6 +4,4 @@
 
 use Enjin\Platform\Models\ModelResolver;
 
-class BeamBatch extends ModelResolver
-{
-}
+class BeamBatch extends ModelResolver {}

src/Models/BeamClaim.php

@@ -4,6 +4,4 @@
 
 use Enjin\Platform\Models\ModelResolver;
 
-class BeamClaim extends ModelResolver
-{
-}
+class BeamClaim extends ModelResolver {}

src/Models/BeamScan.php

@@ -4,6 +4,4 @@
 
 use Enjin\Platform\Models\ModelResolver;
 
-class BeamScan extends ModelResolver
-{
-}
+class BeamScan extends ModelResolver {}

src/Models/Laravel/Beam.php

@@ -16,11 +16,9 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Cache;
-use Staudenmeir\EloquentEagerLimit\HasEagerLimit;
 
 class Beam extends BaseModel
 {
-    use HasEagerLimit;
     use HasFactory;
     use SoftDeletes;
     use Traits\EagerLoadSelectFields;

src/Models/Laravel/BeamClaim.php

@@ -22,11 +22,9 @@
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
-use Staudenmeir\EloquentEagerLimit\HasEagerLimit;
 
 class BeamClaim extends BaseModel
 {
-    use HasEagerLimit;
     use HasFactory;
     use HasSingleUseCodeScope;
     use MassPrunable;
@@ -180,7 +178,7 @@ public function prunable()
             $query = static::whereHas(
                 'beam',
                 fn ($query) => $query->where('end', '<', now()->addDays($days))
-                    ->whereRaw('flags_mask & (1 << ' . BeamFlag::PRUNABLE->value . ') != 0')
+                    ->whereRaw('flags_mask & (1 << '.BeamFlag::PRUNABLE->value.') != 0')
             )->claimable();
 
             // We'll decrement the cache for each beam that has expired claims.