diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml index 5b8a976..ec7d6d6 100644 --- a/.github/workflows/php-cs-fixer.yml +++ b/.github/workflows/php-cs-fixer.yml @@ -13,18 +13,31 @@ on: permissions: contents: write +concurrency: + group: ${{ github.head_ref || github.ref || github.run_id }}_php_cs_fixer + cancel-in-progress: true + jobs: - php-cs-fixer: + lint: runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Run PHP CS Fixer - uses: docker://oskarstark/php-cs-fixer-ga + - uses: actions/checkout@v6 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 with: - args: --config=.php-cs-fixer.dist.php --allow-risky=yes - - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4 + php-version: '8.2' + + - name: Install Dependencies + run: | + composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist + + - name: Run PHP CS Fixer + run: ./vendor/bin/php-cs-fixer fix --allow-risky=yes + + - name: Commit Changes + uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: 🪄 Code Style Fixes + commit_options: '--no-verify' + diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 7b666df..a42d9ee 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -15,12 +15,12 @@ jobs: name: phpstan runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.3' + php-version: '8.5' coverage: none - name: Install composer dependencies diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 121cab6..fa24b86 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,27 +21,20 @@ jobs: fail-fast: true matrix: os: [ ubuntu-latest, windows-latest ] - php: [ 8.1, 8.2, 8.3 ] - laravel: [ '10.*', '11.*', '12.*' ] + php: [ 8.2, 8.3, 8.4, 8.5 ] + laravel: [ '11.*', '12.*' ] stability: [ prefer-lowest, prefer-stable ] include: - - laravel: 10.* - testbench: 8.* - laravel: 11.* testbench: 9.* - laravel: 12.* testbench: 10.* - exclude: - - laravel: 11.* - php: 8.1 - - laravel: 12.* - php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -57,8 +50,7 @@ jobs: - 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 + composer update --${{ matrix.stability }} --with=laravel/framework:${{ matrix.laravel }} --with=orchestra/testbench-core:${{ matrix.testbench }} --prefer-dist --no-interaction - name: Execute tests run: vendor/bin/pest diff --git a/composer.json b/composer.json index e518cba..f0295eb 100644 --- a/composer.json +++ b/composer.json @@ -19,17 +19,17 @@ ], "homepage": "https://github.com/saloonphp/laravel-plugin", "require": { - "php": "^8.1", - "illuminate/console": "^10.0 || ^11.0 || ^12.0", - "illuminate/support": "^10.0 || ^11.0 || ^12.0", + "php": "^8.2", + "illuminate/console": "^11.0 || ^v12.39.0", + "illuminate/support": "^11.0 || ^12.39.0", "saloonphp/saloon": "^3.5", "symfony/finder": "^6.4 || ^7.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.48", - "orchestra/testbench": "^8.21 || ^9.0 || ^10.0", - "pestphp/pest": "^2.32 || ^3.7", - "phpstan/phpstan": "^1.10.56 || ^2.1" + "orchestra/testbench": "^9.15 || ^10.7", + "pestphp/pest": "^3.0|^4.0", + "phpstan/phpstan": "^1.10.57|^2.0.2" }, "minimum-stability": "stable", "prefer-stable": true,