From c8ffd928e0fac282a73c350d98157de1f440209a Mon Sep 17 00:00:00 2001 From: Andrew Wallo Date: Sat, 1 Mar 2025 18:42:24 -0500 Subject: [PATCH 1/6] support laravel 12 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 82d9461..558733e 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "ext-intl": "*", "ext-json": "*", "aws/aws-sdk-php-laravel": "^3.8", - "illuminate/contracts": "^10.0|^11.0", + "illuminate/contracts": "^10.0|^11.0|^12.0", "spatie/laravel-package-tools": "^1.14.0" }, "require-dev": { @@ -32,7 +32,7 @@ "nunomaduro/collision": "^7.8|^8.0", "larastan/larastan": "^2.9", "orchestra/testbench": "^8.8|^9.0", - "pestphp/pest": "^2.20", + "pestphp/pest": "^2.20|^3.0", "pestphp/pest-plugin-arch": "^2.0", "pestphp/pest-plugin-laravel": "^2.0", "phpstan/extension-installer": "^1.1", From 63e080e13f02c5d52d94bf72c7311104d7ffa9e8 Mon Sep 17 00:00:00 2001 From: Andrew Wallo Date: Sat, 1 Mar 2025 18:51:48 -0500 Subject: [PATCH 2/6] update git workflow --- .github/workflows/phpstan.yml | 2 +- .github/workflows/run-tests.yml | 26 +++++++++++++++++++------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 3855a08..c1a2fa8 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -16,7 +16,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: '8.2' coverage: none - name: Install composer dependencies diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 7fefe35..94501ae 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -2,9 +2,9 @@ name: run-tests on: push: - branches: [main] + branches: [ main ] pull_request: - branches: [main] + branches: [ main ] jobs: test: @@ -12,14 +12,26 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-latest, windows-latest] - php: [8.2, 8.1] - laravel: [10.*] - stability: [prefer-lowest, prefer-stable] + os: [ ubuntu-latest, windows-latest ] + php: [ 8.2, 8.1 ] + laravel: [ 10.*, 11.*, 12.* ] + stability: [ prefer-lowest, prefer-stable ] include: - laravel: 10.* testbench: 8.* carbon: ^2.63 + pest: ^2.0 + - laravel: 11.* + testbench: 9.* + carbon: ^2.71 + pest: ^2.0 + - laravel: 12.* + testbench: 10.* + carbon: ^2.71 + pest: ^3.0 + exclude: + - laravel: 12.* + php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} @@ -41,7 +53,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" "pestphp/pest:${{ matrix.pest }}" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction - name: List Installed Dependencies From 884cac4c8c8df0c17125415579ae4ecd2bbb0314 Mon Sep 17 00:00:00 2001 From: Andrew Wallo Date: Sat, 1 Mar 2025 18:56:04 -0500 Subject: [PATCH 3/6] update git workflow --- .github/workflows/run-tests.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 94501ae..0938356 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,24 +14,24 @@ jobs: matrix: os: [ ubuntu-latest, windows-latest ] php: [ 8.2, 8.1 ] - laravel: [ 10.*, 11.*, 12.* ] + laravel: [ 10.* ] stability: [ prefer-lowest, prefer-stable ] include: - laravel: 10.* testbench: 8.* carbon: ^2.63 - pest: ^2.0 - laravel: 11.* testbench: 9.* carbon: ^2.71 - pest: ^2.0 + php: 8.2 + os: ubuntu-latest + stability: prefer-stable - laravel: 12.* testbench: 10.* carbon: ^2.71 - pest: ^3.0 - exclude: - - laravel: 12.* - php: 8.1 + php: 8.2 + os: ubuntu-latest + stability: prefer-stable name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} @@ -53,7 +53,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" "pestphp/pest:${{ matrix.pest }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update --dev composer update --${{ matrix.stability }} --prefer-dist --no-interaction - name: List Installed Dependencies From 64d561c34f1d4aea0d574f8aa24c2c4f282c0927 Mon Sep 17 00:00:00 2001 From: Andrew Wallo Date: Sat, 1 Mar 2025 19:10:04 -0500 Subject: [PATCH 4/6] update git workflow --- .github/workflows/run-tests.yml | 6 +++--- composer.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 0938356..d4a657c 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -19,16 +19,16 @@ jobs: include: - laravel: 10.* testbench: 8.* - carbon: ^2.63 + carbon: 2.* - laravel: 11.* testbench: 9.* - carbon: ^2.71 + carbon: 2.* php: 8.2 os: ubuntu-latest stability: prefer-stable - laravel: 12.* testbench: 10.* - carbon: ^2.71 + carbon: 3.* php: 8.2 os: ubuntu-latest stability: prefer-stable diff --git a/composer.json b/composer.json index 558733e..b5452ef 100644 --- a/composer.json +++ b/composer.json @@ -31,10 +31,10 @@ "laravel/pint": "^1.0", "nunomaduro/collision": "^7.8|^8.0", "larastan/larastan": "^2.9", - "orchestra/testbench": "^8.8|^9.0", + "orchestra/testbench": "^8.8|^9.0|^10.0", "pestphp/pest": "^2.20|^3.0", - "pestphp/pest-plugin-arch": "^2.0", - "pestphp/pest-plugin-laravel": "^2.0", + "pestphp/pest-plugin-arch": "^2.0|^3.0", + "pestphp/pest-plugin-laravel": "^2.0|^3.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", From 715f8c9ef2ac3e82d5ce3bf206064eb199bdedd5 Mon Sep 17 00:00:00 2001 From: Andrew Wallo Date: Sat, 1 Mar 2025 19:14:46 -0500 Subject: [PATCH 5/6] update git workflow --- .github/workflows/run-tests.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index d4a657c..2896b1b 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -17,18 +17,13 @@ jobs: laravel: [ 10.* ] stability: [ prefer-lowest, prefer-stable ] include: - - laravel: 10.* - testbench: 8.* - carbon: 2.* - laravel: 11.* testbench: 9.* - carbon: 2.* php: 8.2 os: ubuntu-latest stability: prefer-stable - laravel: 12.* testbench: 10.* - carbon: 3.* php: 8.2 os: ubuntu-latest stability: prefer-stable @@ -51,11 +46,23 @@ jobs: echo "::add-matcher::${{ runner.tool_cache }}/php.json" echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - - name: Install dependencies + - name: Install dependencies for Laravel 10 + if: matrix.laravel == '10.*' run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update --dev composer update --${{ matrix.stability }} --prefer-dist --no-interaction + - name: Install dependencies for Laravel 11 + if: matrix.laravel == '11.*' + run: | + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --dev + composer update --${{ matrix.stability }} --prefer-dist --no-interaction --with-all-dependencies + + - name: Install dependencies for Laravel 12 + if: matrix.laravel == '12.*' + run: | + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --dev + composer update --${{ matrix.stability }} --prefer-dist --no-interaction --with-all-dependencies + - name: List Installed Dependencies run: composer show -D From f51e7f4cde4447f285fe7166d52962a116b5e01b Mon Sep 17 00:00:00 2001 From: Andrew Wallo Date: Sat, 1 Mar 2025 19:20:31 -0500 Subject: [PATCH 6/6] remove git tests --- .github/workflows/run-tests.yml | 70 --------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 .github/workflows/run-tests.yml diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml deleted file mode 100644 index 2896b1b..0000000 --- a/.github/workflows/run-tests.yml +++ /dev/null @@ -1,70 +0,0 @@ -name: run-tests - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - test: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: true - matrix: - os: [ ubuntu-latest, windows-latest ] - php: [ 8.2, 8.1 ] - laravel: [ 10.* ] - stability: [ prefer-lowest, prefer-stable ] - include: - - laravel: 11.* - testbench: 9.* - php: 8.2 - os: ubuntu-latest - stability: prefer-stable - - laravel: 12.* - testbench: 10.* - php: 8.2 - os: ubuntu-latest - stability: prefer-stable - - name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - 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 problem matchers - run: | - echo "::add-matcher::${{ runner.tool_cache }}/php.json" - echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - - - name: Install dependencies for Laravel 10 - if: matrix.laravel == '10.*' - run: | - composer update --${{ matrix.stability }} --prefer-dist --no-interaction - - - name: Install dependencies for Laravel 11 - if: matrix.laravel == '11.*' - run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --dev - composer update --${{ matrix.stability }} --prefer-dist --no-interaction --with-all-dependencies - - - name: Install dependencies for Laravel 12 - if: matrix.laravel == '12.*' - run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --dev - composer update --${{ matrix.stability }} --prefer-dist --no-interaction --with-all-dependencies - - - name: List Installed Dependencies - run: composer show -D - - - name: Execute tests - run: vendor/bin/pest --ci