diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index 363afd99f..51a117fa9 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -56,18 +56,22 @@ jobs: env: DEBUG: ${{secrets.DEBUG}} - name: Download Composer cache dependencies from cache + if: (!startsWith(matrix.php, '7.2')) id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache Composer dependencies + if: (!startsWith(matrix.php, '7.2')) uses: actions/cache@v1 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ matrix.os }}-composer-${{ hashFiles('**/composer.json') }} restore-keys: ${{ matrix.os }}-composer- - name: Install dependencies + if: (!startsWith(matrix.php, '7.2')) run: | composer install --no-interaction - name: Run tests + if: (!startsWith(matrix.php, '7.2')) run: | ./vendor/bin/phpunit --coverage-clover coverage.xml env: diff --git a/CHANGELOG.md b/CHANGELOG.md index 432ed3a3c..614d35fa6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Added +- Laravel 8 support by [@divine](https://github.com/divine). + +### Changed +- Updated versions of all dependencies by [@divine](https://github.com/divine). + ## [3.7.0] - 2020-09-18 ### Added diff --git a/README.md b/README.md index e801fd51b..c30100908 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,7 @@ Make sure you have the MongoDB PHP driver installed. You can find installation i 5.8.x | 3.5.x 6.x | 3.6.x 7.x | 3.7.x + 8.x | 3.8.x Install the package via Composer: diff --git a/composer.json b/composer.json index 872a48cd3..35f7d26d8 100644 --- a/composer.json +++ b/composer.json @@ -19,15 +19,15 @@ ], "license": "MIT", "require": { - "illuminate/support": "^7.0", - "illuminate/container": "^7.0", - "illuminate/database": "^7.0", - "illuminate/events": "^7.0", + "illuminate/support": "^8.0", + "illuminate/container": "^8.0", + "illuminate/database": "^8.0", + "illuminate/events": "^8.0", "mongodb/mongodb": "^1.6" }, "require-dev": { - "phpunit/phpunit": "^8.4|^9.0", - "orchestra/testbench": "^5.0", + "phpunit/phpunit": "^9.0", + "orchestra/testbench": "^6.0", "mockery/mockery": "^1.3.1", "doctrine/dbal": "^2.6" }, diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 38d2b79c9..4dc18cb41 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,13 +1,10 @@ - + + + + ./src + + tests/ @@ -37,11 +34,6 @@ tests/ValidationTest.php - - - ./src - - diff --git a/src/Jenssegers/Mongodb/Relations/MorphTo.php b/src/Jenssegers/Mongodb/Relations/MorphTo.php index 704c4722c..5938f9eeb 100644 --- a/src/Jenssegers/Mongodb/Relations/MorphTo.php +++ b/src/Jenssegers/Mongodb/Relations/MorphTo.php @@ -31,7 +31,7 @@ protected function getResultsByType($type) $query = $instance->newQuery(); - return $query->whereIn($key, $this->gatherKeysByType($type))->get(); + return $query->whereIn($key, $this->gatherKeysByType($type, $instance->getKeyType()))->get(); } /** diff --git a/tests/QueueTest.php b/tests/QueueTest.php index ce32c0979..5b07c9492 100644 --- a/tests/QueueTest.php +++ b/tests/QueueTest.php @@ -37,7 +37,7 @@ public function testQueueJobLifeCycle(): void 'job' => 'test', 'maxTries' => null, 'maxExceptions' => null, - 'delay' => null, + 'backoff' => null, 'timeout' => null, 'data' => ['action' => 'QueueJobLifeCycle'], ]), $job->getRawBody());