Support Laravel 10

Author: staudenmeir

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.2, 8.1, 8.0]
+        php: [8.2, 8.1]
         database: [mysql, pgsql, sqlite, sqlsrv]
         release: [stable, lowest]
         include:

.scrutinizer.yml

@@ -1,6 +1,6 @@
 build:
   environment:
-    php: 8.1
+    php: 8.2
 tools:
   external_code_coverage:
     runs: 4

composer.json

@@ -9,14 +9,13 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
-        "illuminate/database": "^9.0",
-        "staudenmeir/eloquent-has-many-deep-contracts": "^1.0"
+        "php": "^8.1",
+        "illuminate/database": "^10.0",
+        "staudenmeir/eloquent-has-many-deep-contracts": "^1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
-        "nesbot/carbon": "^2.62.1",
-        "staudenmeir/eloquent-has-many-deep": "^1.17"
+        "phpunit/phpunit": "^9.5.27",
+        "staudenmeir/eloquent-has-many-deep": "^1.18"
     },
     "autoload": {
         "psr-4": {
@@ -28,6 +27,11 @@
             "Tests\\": "tests/"
         }
     },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.8.x-dev"
+        }
+    },
     "minimum-stability": "dev",
     "prefer-stable": true
 }

tests/BelongsToJsonTest.php

@@ -2,7 +2,6 @@
 
 namespace Tests;
 
-use Composer\InstalledVersions;
 use Illuminate\Database\Capsule\Manager as DB;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
@@ -151,11 +150,6 @@ public function testExistenceQueryForSelfRelationWithObjects()
      */
     public function testAttach(string $userModel)
     {
-        // TODO[L10]
-        if (version_compare(InstalledVersions::getVersion('illuminate/database'), '9.18') === -1) {
-            $this->markTestSkipped();
-        }
-
         $user = (new $userModel())->roles()->attach([1, 2]);
 
         $this->assertEquals([1, 2], $user->roles()->pluck('id')->all());
@@ -170,11 +164,6 @@ public function testAttach(string $userModel)
      */
     public function testAttachWithObjects(string $userModel)
     {
-        // TODO[L10]
-        if (version_compare(InstalledVersions::getVersion('illuminate/database'), '9.18') === -1) {
-            $this->markTestSkipped();
-        }
-
         $user = new $userModel();
         $user->options = [
             'roles' => [
@@ -290,14 +279,10 @@ public function userModelProvider(): array
         $users = [
             [User::class],
             [UserAsArrayable::class],
+            [UserAsArrayObject::class],
+            [UserAsCollection::class],
         ];
 
-        // TODO[L10]
-        if (class_exists('Illuminate\Database\Eloquent\Casts\AsArrayObject')) {
-            $users[] = [UserAsArrayObject::class];
-            $users[] = [UserAsCollection::class];
-        }
-
         return $users;
     }
 }