From 60507cbc8234d6659e9d5808aebf17f5f7d28cba Mon Sep 17 00:00:00 2001 From: Shift Date: Fri, 1 Mar 2024 20:38:49 +0000 Subject: [PATCH 1/2] Bump dependencies for Laravel 11 --- composer.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 46d849f..54c8a4d 100644 --- a/composer.json +++ b/composer.json @@ -17,19 +17,19 @@ ], "require": { "php": "^8.0", - "illuminate/container": "^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/log": "^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/container": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "illuminate/log": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", "willdurand/email-reply-parser": "^2.8", - "zbateson/mail-mime-parser": "^1.1" + "zbateson/mail-mime-parser": "^1.1|^2.4" }, "require-dev": { "laminas/laminas-mail": "^2.13", "mockery/mockery": "^1.2", - "orchestra/testbench": "^4.0|^5.0|^7.0|^8.0", - "phpunit/phpunit": "^7.0|^8.0|^9.3" + "orchestra/testbench": "^4.0|^5.0|^7.0|^8.0|^9.0", + "phpunit/phpunit": "^7.0|^8.0|^9.3|^10.5" }, "autoload": { "psr-4": { From b9ad026fd8c661b33f2cb2b6ee122541e995cdef Mon Sep 17 00:00:00 2001 From: Shift Date: Fri, 1 Mar 2024 20:38:49 +0000 Subject: [PATCH 2/2] Update GitHub Actions for Laravel 11 --- .github/workflows/run-tests.yml | 102 +++++++++++++++++--------------- 1 file changed, 53 insertions(+), 49 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index e1e360c..4769dc8 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -1,53 +1,57 @@ name: run-tests -on: [push, pull_request] +on: + - push + - pull_request jobs: - test: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest] - php: [8.0, 8.1, 8.2] - laravel: [9.*, 8.*, 10.*] - stability: [prefer-stable] - exclude: - - php: 8.0 - laravel: 10.* - - php: 8.2 - laravel: 8.* - include: - - laravel: 10.* - testbench: 8.* - - laravel: 9.* - testbench: 7.* - - laravel: 8.* - testbench: 6.23 - - name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick - coverage: none - -# - name: Setup problem matchers -# run: | -# echo "::add-matcher::${{ runner.tool_cache }}/php.json" -# echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" -# - - name: Install dependencies - run: | - composer install - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer update --${{ matrix.stability }} --prefer-dist --no-interaction - - - name: Execute tests - run: vendor/bin/phpunit + test: + runs-on: ${{ matrix.os }} + + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest] + php: [8.0, 8.1, 8.2] + laravel: ['8.*', '9.*', '10.*', '11.*'] + stability: [prefer-stable] + exclude: + - php: 8.0 + laravel: 10.* + - php: 8.2 + laravel: 8.* + - laravel: 11.* + php: 8.0 + - laravel: 11.* + php: 8.1 + include: + - laravel: 10.* + testbench: 8.* + - laravel: 9.* + testbench: 7.* + - laravel: 8.* + testbench: 6.23 + - laravel: 11.* + testbench: 9.* + + name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick + coverage: none + + - name: Install dependencies + run: | + composer install + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer update --${{ matrix.stability }} --prefer-dist --no-interaction + + - name: Execute tests + run: vendor/bin/phpunit