From a73aabde19e5f50bf04a756cb8655a75da289a51 Mon Sep 17 00:00:00 2001 From: Shift Date: Fri, 1 Mar 2024 17:08:31 +0000 Subject: [PATCH 1/2] Bump dependencies for Laravel 11 --- composer.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index b5927ea..86b1fda 100644 --- a/composer.json +++ b/composer.json @@ -4,27 +4,27 @@ "version": "5.2.0", "license": "MIT", "require": { - "php" : "^8.0", - "illuminate/support": "^9.0 || ^10.0", + "php": "^8.0", + "illuminate/support": "^9.0 || ^10.0 || ^11.0", "twig/twig": "^2.7 || ^3.4", "doctrine/dbal": "^3.0", "barryvdh/laravel-dompdf": "^1.0 || ^2.0", - "spatie/browsershot": "^3.40.3" + "spatie/browsershot": "^3.40.3 || ^4.0" }, "repositories": [ { - "type": "github", - "url": "https://github.com/wdev-rs/rmt.git", - "reference": "master" + "type": "github", + "url": "https://github.com/wdev-rs/rmt.git", + "reference": "master" } ], "require-dev": { "liip/rmt": "dev-master", - "phpunit/phpunit": "^9.4", - "orchestra/testbench": "^7.0 || ^8.0", + "phpunit/phpunit": "^9.4 || ^10.5", + "orchestra/testbench": "^7.0 || ^8.0 || ^9.0", "orchestra/testbench-browser-kit": "^7.0 || ^8.0", "squizlabs/php_codesniffer": "^3.5", - "phpstan/phpstan": "^0.12.0", + "phpstan/phpstan": "^0.12.0 || ^1.10", "phpmd/phpmd": "^2.7", "mockery/mockery": "^1.2" }, @@ -57,7 +57,7 @@ "vendor/bin/phpstan analyze src" ], "inspect-fix": "vendor/bin/phpcbf", - "insights" : "vendor/bin/phpmd src text phpmd.xml" + "insights": "vendor/bin/phpmd src text phpmd.xml" }, "extra": { "laravel": { From b7a5a4ba47d4264a0715105780a3e3977ab0ff40 Mon Sep 17 00:00:00 2001 From: Shift Date: Fri, 1 Mar 2024 17:08:31 +0000 Subject: [PATCH 2/2] Update GitHub Actions for Laravel 11 --- .github/workflows/test.yml | 41 ++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7107f19..74f77c7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,25 +1,32 @@ name: Tests -on: [push, pull_request] +on: + - push + - pull_request jobs: run-tests: - runs-on: ubuntu-latest + strategy: - matrix: - php-versions: ['8.0', '8.1'] + matrix: + php-versions: ['8.0', '8.1', '8.2'] + steps: - - uses: actions/checkout@v2 - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-versions }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Install Dependencies - run: composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist - - name: Install pupeteer - run: sudo npm install --global --unsafe-perm puppeteer@18.2.1 - - name: Execute tests (Unit and Feature tests) via PHPUnit - run: vendor/bin/phpunit + - uses: actions/checkout@v2 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-versions }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Install Dependencies + run: composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist + + - name: Install pupeteer + run: sudo npm install --global --unsafe-perm puppeteer@18.2.1 + + - name: Execute tests (Unit and Feature tests) via PHPUnit + run: vendor/bin/phpunit