From 0a19f66e45b8b4ff8c381643127e732ce0e426e3 Mon Sep 17 00:00:00 2001 From: Shift Date: Sat, 2 Mar 2024 04:33:09 +0000 Subject: [PATCH 1/5] Bump dependencies for Laravel 11 --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index c3209bf..bb51683 100644 --- a/composer.json +++ b/composer.json @@ -21,14 +21,14 @@ ], "require": { "php": "^7.2|^8.0", - "illuminate/support": "^5.8|^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/cookie": "^5.8|^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/session": "^5.8|^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/support": "^5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "illuminate/cookie": "^5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "illuminate/session": "^5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", "laravel/tinker": "^1.0|^2.0" }, "require-dev": { - "orchestra/testbench": "^3.8|^4.0|^5.0|^6.0|^7.0|^8.0", - "phpunit/phpunit": "^8.0|^9.0" + "orchestra/testbench": "^3.8|^4.0|^5.0|^6.0|^7.0|^8.0|^9.0", + "phpunit/phpunit": "^8.0|^9.0|^10.5" }, "autoload": { "psr-4": { From 3dca97e3053bc192a3b18634988eb127a6d3ba4a Mon Sep 17 00:00:00 2001 From: Shift Date: Sat, 2 Mar 2024 04:33:10 +0000 Subject: [PATCH 2/5] Update GitHub Actions for Laravel 11 --- .github/workflows/run-tests.yml | 168 ++++++++++++++++++-------------- 1 file changed, 93 insertions(+), 75 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 741eeb8..9db6011 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -1,82 +1,100 @@ 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, windows-latest] - php: [8.1, 8.0, 7.4, 7.3, 7.2] - laravel: [5.8.*, 6.20.*, 7.29.*, 8.20.*, 9.*, 10.*] # use lowest versions that support PHP 8 - dependency-version: [prefer-lowest, prefer-stable] - include: - - laravel: 10.* - testbench: 8.* - - laravel: 9.* - testbench: 7.* - - laravel: 8.20.* - testbench: 6.* - - laravel: 7.29.* - testbench: 5.* - - laravel: 6.20.* - testbench: 4.* - - laravel: 5.8.* - testbench: 3.8.* - exclude: - - laravel: 10.* - php: 8.0 - - laravel: 10.* - php: 7.4 - - laravel: 10.* - php: 7.3 - - laravel: 10.* - php: 7.2 - - laravel: 9.* - php: 7.4 - - laravel: 9.* - php: 7.3 - - laravel: 9.* - php: 7.2 - - laravel: 8.20.* - php: 8.1 - - laravel: 8.20.* - php: 7.2 - - laravel: 7.29.* - php: 8.1 - - laravel: 7.29.* - php: 8.0 - - laravel: 6.20.* - php: 8.1 - - laravel: 6.20.* - php: 8.0 - - laravel: 5.8.* - php: 8.1 - - laravel: 5.8.* - php: 8.0 - name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} + test: + runs-on: ${{ matrix.os }} + + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest, windows-latest] + php: [7.2, 7.3, 7.4, 8.0, 8.1, '8.2'] + laravel: ['5.8.*', '6.20.*', '7.29.*', '8.20.*', '9.*', '10.*', '11.*'] + dependency-version: [prefer-lowest, prefer-stable] + include: + - laravel: 10.* + testbench: 8.* + - laravel: 9.* + testbench: 7.* + - laravel: 8.20.* + testbench: 6.* + - laravel: 7.29.* + testbench: 5.* + - laravel: 6.20.* + testbench: 4.* + - laravel: 5.8.* + testbench: 3.8.* + - laravel: 11.* + testbench: 9.* + exclude: + - laravel: 10.* + php: 8.0 + - laravel: 10.* + php: 7.4 + - laravel: 10.* + php: 7.3 + - laravel: 10.* + php: 7.2 + - laravel: 9.* + php: 7.4 + - laravel: 9.* + php: 7.3 + - laravel: 9.* + php: 7.2 + - laravel: 8.20.* + php: 8.1 + - laravel: 8.20.* + php: 7.2 + - laravel: 7.29.* + php: 8.1 + - laravel: 7.29.* + php: 8.0 + - laravel: 6.20.* + php: 8.1 + - laravel: 6.20.* + php: 8.0 + - laravel: 5.8.* + php: 8.1 + - laravel: 5.8.* + php: 8.0 + - laravel: 11.* + php: 7.2 + - laravel: 11.* + php: 7.3 + - laravel: 11.* + php: 7.4 + - laravel: 11.* + php: 8.0 + - laravel: 11.* + php: 8.1 + + name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} - steps: - - name: Checkout code - uses: actions/checkout@v2 + steps: + - name: Checkout code + uses: actions/checkout@v2 - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: ~/.composer/cache/files - key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} + - name: Cache dependencies + uses: actions/cache@v2 + with: + path: ~/.composer/cache/files + key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - - 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, fileinfo - coverage: none + - 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, fileinfo + coverage: none - - name: Install dependencies - run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest + - name: Install dependencies + run: | + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest - - name: Execute tests - run: vendor/bin/phpunit + - name: Execute tests + run: vendor/bin/phpunit From 11d49385934851f849ab4af2663bc9d20d248bea Mon Sep 17 00:00:00 2001 From: Freek Van der Herten Date: Sat, 2 Mar 2024 06:36:44 +0100 Subject: [PATCH 3/5] Update run-tests.yml --- .github/workflows/run-tests.yml | 55 ++------------------------------- 1 file changed, 2 insertions(+), 53 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 9db6011..bd9036d 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -12,65 +12,14 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest] - php: [7.2, 7.3, 7.4, 8.0, 8.1, '8.2'] - laravel: ['5.8.*', '6.20.*', '7.29.*', '8.20.*', '9.*', '10.*', '11.*'] + php: [8.0, 8.1, 8.2, 8.3] + laravel: [ '10.*', '11.*'] dependency-version: [prefer-lowest, prefer-stable] include: - laravel: 10.* testbench: 8.* - - laravel: 9.* - testbench: 7.* - - laravel: 8.20.* - testbench: 6.* - - laravel: 7.29.* - testbench: 5.* - - laravel: 6.20.* - testbench: 4.* - - laravel: 5.8.* - testbench: 3.8.* - laravel: 11.* testbench: 9.* - exclude: - - laravel: 10.* - php: 8.0 - - laravel: 10.* - php: 7.4 - - laravel: 10.* - php: 7.3 - - laravel: 10.* - php: 7.2 - - laravel: 9.* - php: 7.4 - - laravel: 9.* - php: 7.3 - - laravel: 9.* - php: 7.2 - - laravel: 8.20.* - php: 8.1 - - laravel: 8.20.* - php: 7.2 - - laravel: 7.29.* - php: 8.1 - - laravel: 7.29.* - php: 8.0 - - laravel: 6.20.* - php: 8.1 - - laravel: 6.20.* - php: 8.0 - - laravel: 5.8.* - php: 8.1 - - laravel: 5.8.* - php: 8.0 - - laravel: 11.* - php: 7.2 - - laravel: 11.* - php: 7.3 - - laravel: 11.* - php: 7.4 - - laravel: 11.* - php: 8.0 - - laravel: 11.* - php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} From 7dc9d56a3d70a3c6b49da00e5ed3be404a1886b9 Mon Sep 17 00:00:00 2001 From: Freek Van der Herten Date: Sat, 2 Mar 2024 06:39:13 +0100 Subject: [PATCH 4/5] Update run-tests.yml --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index bd9036d..864a08c 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest] - php: [8.0, 8.1, 8.2, 8.3] + php: [8.2, 8.3] laravel: [ '10.*', '11.*'] dependency-version: [prefer-lowest, prefer-stable] include: From 0791fb019c76cf7c50adc934ee32988ba67cd556 Mon Sep 17 00:00:00 2001 From: Freek Van der Herten Date: Sat, 2 Mar 2024 06:40:00 +0100 Subject: [PATCH 5/5] Update composer.json --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index bb51683..d2a0dbb 100644 --- a/composer.json +++ b/composer.json @@ -20,15 +20,15 @@ } ], "require": { - "php": "^7.2|^8.0", - "illuminate/support": "^5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "illuminate/cookie": "^5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "illuminate/session": "^5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "laravel/tinker": "^1.0|^2.0" + "php": "^8.2", + "illuminate/support": "^10.0|^11.0", + "illuminate/cookie": "^10.0|^11.0", + "illuminate/session": "^10.0|^11.0", + "laravel/tinker": "^2.0" }, "require-dev": { - "orchestra/testbench": "^3.8|^4.0|^5.0|^6.0|^7.0|^8.0|^9.0", - "phpunit/phpunit": "^8.0|^9.0|^10.5" + "orchestra/testbench": "^8.0|^9.0", + "phpunit/phpunit": "^9.0|^10.5" }, "autoload": { "psr-4": {