Merge 5.5 into 5.x (#3465)

Author: mongodb-php-bot

.github/workflows/build-ci-atlas.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - "[0-9]+.[0-9x]+"
-      - "feature/*"
   pull_request:
     branches:
       - "[0-9]+.[0-9x]+"
@@ -16,28 +15,34 @@ env:
 
 jobs:
   build:
-    runs-on: "${{ matrix.os }}"
+    runs-on: "ubuntu-latest"
 
     name: "PHP/${{ matrix.php }} Laravel/${{ matrix.laravel }} Driver/${{ matrix.driver }}"
 
     strategy:
       matrix:
-        os:
-          - "ubuntu-latest"
         php:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         laravel:
-          - "11.*"
           - "12.*"
         driver:
-          - 1
+          - 2
         include:
+          # Test Laravel 10
+          - php: "8.1"
+            laravel: "10.*"
+            driver: 1
+          # Test Laravel 11
+          - php: "8.2"
+            laravel: "11.*"
+            driver: 1
+          # Test Driver v1
           - php: "8.4"
             laravel: "12.*"
-            os: "ubuntu-latest"
-            driver: 2
+            driver: 1
 
     steps:
       - uses: "actions/checkout@v6"

.github/workflows/build-ci.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - "[0-9]+.[0-9x]+"
-      - "feature/*"
   pull_request:
     branches:
       - "[0-9]+.[0-9x]+"
@@ -16,53 +15,63 @@ env:
 
 jobs:
   build:
-    runs-on: "${{ matrix.os }}"
+    runs-on: "ubuntu-latest"
 
     name: "PHP/${{ matrix.php }} Laravel/${{ matrix.laravel }} Driver/${{ matrix.driver }} Server/${{ matrix.mongodb }} ${{ matrix.mode }}"
 
     strategy:
       matrix:
-        os:
-          - "ubuntu-latest"
         mongodb:
-          - "4.4"
-          - "5.0"
-          - "6.0"
-          - "7.0"
           - "8.0"
         php:
-          - "8.1"
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         laravel:
-          - "10.*"
-          - "11.*"
           - "12.*"
         driver:
           - 2
         include:
+          # Test Lowest dependencies
           - php: "8.1"
             laravel: "10.*"
             mongodb: "5.0"
             mode: "low-deps"
-            os: "ubuntu-latest"
             driver: 1
+          # Test Driver v1
           - php: "8.3"
-            laravel: "11.*"
-            mongodb: "8.0"
-            os: "ubuntu-latest"
+            laravel: "10.*"
+            mongodb: "4.4"
             driver: 1
           - php: "8.4"
             laravel: "12.*"
             mongodb: "8.0"
-            os: "ubuntu-latest"
             driver: 1
-        exclude:
-          - php: "8.1"
+          # Test Laravel 10
+          - php: "8.5"
+            laravel: "10.*"
+            mongodb: "8.0"
+          # Test Laravel 11
+          - php: "8.5"
             laravel: "11.*"
-          - php: "8.1"
+            mongodb: "8.0"
+          # Test all server versions with the lowest PHP and latest Laravel
+          - php: "8.2"
+            laravel: "12.*"
+            mongodb: "4.4"
+          - php: "8.2"
+            laravel: "12.*"
+            mongodb: "5.0"
+          - php: "8.2"
             laravel: "12.*"
+            mongodb: "6.0"
+          - php: "8.2"
+            laravel: "12.*"
+            mongodb: "7.0"
+          - php: "8.2"
+            laravel: "12.*"
+            mongodb: "8.0"
 
     steps:
       - uses: "actions/checkout@v6"

.github/workflows/coding-standards.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - "[0-9]+.[0-9x]+"
-      - "feature/*"
   pull_request:
     branches:
       - "[0-9]+.[0-9x]+"

.github/workflows/merge-up.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - "[0-9]+.[0-9x]+"
-      - "feature/*"
 
 env:
   GH_TOKEN: ${{ secrets.MERGE_UP_TOKEN }}

.github/workflows/static-analysis.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - "[0-9]+.[0-9x]+"
-      - "feature/*"
   pull_request:
     branches:
       - "[0-9]+.[0-9x]+"
@@ -17,7 +16,7 @@ on:
         required: true
 
 env:
-  PHP_VERSION: "8.2"
+  PHP_VERSION: "8.5"
   DRIVER_VERSION: "stable"
   MONGODB_EXT_V1: mongodb-1.21.0
   MONGODB_EXT_V2: mongodb-mongodb/mongo-php-driver@v2.x
@@ -34,9 +33,12 @@ jobs:
           - '8.2'
           - '8.3'
           - '8.4'
+          - '8.5'
         driver:
-          - 1
           - 2
+        include:
+          - php: "8.4"
+            driver: 1
     steps:
       - name: Checkout
         uses: actions/checkout@v6

src/Scout/ScoutEngine.php

@@ -151,7 +151,7 @@ public function update($models)
     #[Override]
     public function delete($models): void
     {
-        assert($models instanceof EloquentCollection, new TypeError(sprintf('Argument #1 ($models) must be of type %s, %s given', Collection::class, get_debug_type($models))));
+        assert($models instanceof EloquentCollection, new TypeError(sprintf('Argument #1 ($models) must be of type %s, %s given', EloquentCollection::class, get_debug_type($models))));
 
         if ($models->isEmpty()) {
             return;

tests/Scout/ScoutEngineTest.php

@@ -21,6 +21,7 @@
 use MongoDB\Laravel\Tests\Scout\Models\SearchableModel;
 use MongoDB\Laravel\Tests\TestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
+use TypeError;
 
 use function array_replace_recursive;
 use function count;
@@ -670,4 +671,17 @@ public function testDeleteWithRemoveableScoutCollection(): void
         $engine = new ScoutEngine($database, softDelete: false);
         $engine->delete($job->models);
     }
+
+    public function testDeleteRejectsNonEloquentCollection(): void
+    {
+        $database = $this->createMock(Database::class);
+        $engine = new ScoutEngine($database, softDelete: false);
+
+        $this->expectException(TypeError::class);
+        $this->expectExceptionMessage(
+            'Argument #1 ($models) must be of type Illuminate\Database\Eloquent\Collection',
+        );
+
+        $engine->delete(LaravelCollection::make([1, 2, 3]));
+    }
 }