From 60cd7f304f2ee2b707fd2b429615a2c2115ebc36 Mon Sep 17 00:00:00 2001 From: Matthew Hailwood Date: Fri, 14 Feb 2025 15:11:56 +1300 Subject: [PATCH 1/2] Add support for Laravel 12. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2bf1431..8cfcb65 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "require": { "php": "^8.2", "spatie/laravel-package-tools": "^1.14.0", - "illuminate/contracts": "^11.0" + "illuminate/contracts": "^11.0|^12.0" }, "require-dev": { "inertiajs/inertia-laravel": "<2", From 99c7c336708f5d83e05ba62199273a14c284d9b4 Mon Sep 17 00:00:00 2001 From: Matthew Hailwood Date: Fri, 14 Feb 2025 15:14:19 +1300 Subject: [PATCH 2/2] Fix workflows. --- .github/workflows/phpstan.yml | 2 +- .github/workflows/run-tests.yml | 47 --------------------------------- 2 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 .github/workflows/run-tests.yml diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 3855a08..d9306d6 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.3' coverage: none - name: Install composer dependencies diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml deleted file mode 100644 index caa2c03..0000000 --- a/.github/workflows/run-tests.yml +++ /dev/null @@ -1,47 +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.0, 8.1] - laravel: [9.*] - stability: [prefer-lowest, prefer-stable] - include: - - laravel: 10.* - testbench: 7.* - - 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 - run: | - 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/pest