From 426f1f9a3e2d37c3f8ad9288df4511bf9629ef62 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 28 Jan 2025 01:24:18 +1100 Subject: [PATCH 1/3] Updates for laravel 11 support --- .github/workflows/ci.yml | 6 +++--- .travis.yml | 33 --------------------------------- composer.json | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 46 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a7d33c..0cfd2d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,14 +9,14 @@ on: jobs: tests: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: stability: [prefer-stable] - php: [8.1, 8.2, 8.3, 8.4] - laravel: [10] + php: [8.2, 8.3, 8.4] + laravel: [11] name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c1894ad..0000000 --- a/.travis.yml +++ /dev/null @@ -1,33 +0,0 @@ -dist: bionic -language: php - -php: - - 8.1.0 - -env: - global: - - setup=basic - - xdebug=false - jobs: - - LARAVEL_VERSION=10.* - -cache: - directories: - - $HOME/.composer/cache - -before_install: - - if [[ $xdebug = 'true' ]] ; then phpenv config-rm xdebug.ini; fi - - composer self-update --2 - -install: - - if [[ $setup = 'basic' ]]; then travis_retry composer install --prefer-dist --no-interaction --no-suggest; fi - - if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-dist --no-interaction --no-suggest --prefer-stable; fi - - if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-dist --no-interaction --no-suggest --prefer-stable --prefer-lowest; fi - -before_script: - - if [ "$LARAVEL_VERSION" != "" ]; then composer require --dev "laravel/framework:${LARAVEL_VERSION}" --no-update; fi; - - if [ "$LARAVEL_VERSION" != "" ]; then composer require --dev "illuminate/support:${LARAVEL_VERSION}" --no-update; fi; - - composer update - -script: - - composer test diff --git a/composer.json b/composer.json index ec0d71f..66bba3b 100644 --- a/composer.json +++ b/composer.json @@ -10,21 +10,21 @@ } ], "require": { - "php": "^8.1", - "api-ecosystem-for-laravel/dingo-api": "^4.1", - "php-open-source-saver/jwt-auth": "^2.1", - "illuminate/support": "^10.0", - "ramsey/uuid": "^4.3", + "php": "^8.2", + "api-ecosystem-for-laravel/dingo-api": "^4.2", + "php-open-source-saver/jwt-auth": "^2.7", + "illuminate/support": "^11.0", + "ramsey/uuid": "^4.7", "nesbot/carbon": "^2.0|^3.0" }, "require-dev": { "ext-json": "*", - "beyondcode/laravel-dump-server": "^1.9", - "fakerphp/faker": "^1.18", - "mockery/mockery": "^1.5", - "nunomaduro/collision": "^7.10", + "beyondcode/laravel-dump-server": "^2.0", + "fakerphp/faker": "^1.23", + "mockery/mockery": "^1.6", + "nunomaduro/collision": "^8.6", "phpunit/phpunit": "^10.1", - "orchestra/testbench": "^8.20", + "orchestra/testbench": "^9.9", "laravel/legacy-factories": "^1.0" }, "autoload": { From 6fdb4621387c747c0e5197a54b8073bd4cfc8212 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 28 Jan 2025 01:28:46 +1100 Subject: [PATCH 2/3] Update phpunit version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 66bba3b..c1fb160 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "fakerphp/faker": "^1.23", "mockery/mockery": "^1.6", "nunomaduro/collision": "^8.6", - "phpunit/phpunit": "^10.1", + "phpunit/phpunit": "^11.5", "orchestra/testbench": "^9.9", "laravel/legacy-factories": "^1.0" }, From 33f51d2480554c1624a0d9b96d350b56eaefae1b Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 28 Jan 2025 01:34:29 +1100 Subject: [PATCH 3/3] Call parent tearDown in testcase --- test/tests/SetupTestApp.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/tests/SetupTestApp.php b/test/tests/SetupTestApp.php index 5d5e40f..595d6cf 100644 --- a/test/tests/SetupTestApp.php +++ b/test/tests/SetupTestApp.php @@ -35,6 +35,8 @@ protected function setUp(): void */ public function tearDown(): void { + parent::tearDown(); + Mockery::close(); }