From 72635570197df65b6f9bd3e53b2738e32aa1ef67 Mon Sep 17 00:00:00 2001 From: Shift Date: Mon, 17 Feb 2025 01:21:25 +0000 Subject: [PATCH 1/2] Bump dependencies for Laravel 12 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 022273d..8ce2180 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ ], "require": { "php": ">=7.1", - "laravel/framework": "~5.1|6.*|7.*|8.*|9.*|10.*|^11.0" + "laravel/framework": "~5.1|6.*|7.*|8.*|9.*|10.*|^11.0|^12.0" }, "require-dev": { "orchestra/testbench": ">=3.0", From 6a36b8a1c847c884d439fbe23001fb3ae12b8221 Mon Sep 17 00:00:00 2001 From: Shift Date: Mon, 17 Feb 2025 01:21:25 +0000 Subject: [PATCH 2/2] Update GitHub Actions for Laravel 12 --- .github/workflows/code_coverage.yml | 76 +++++++++++++---------------- .github/workflows/tests.yml | 12 ++++- 2 files changed, 46 insertions(+), 42 deletions(-) diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index 06860fe..5928992 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -1,58 +1,52 @@ name: Code Coverage -# Controls when the workflow will run on: push: - branches: [ "master" ] + branches: + - master pull_request: - branches: [ "master" ] - - # Allows you to run this workflow manually from the Actions tab + branches: + - master workflow_dispatch: -# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: test: - # The type of runner that the job will run on runs-on: ${{ matrix.os }} + strategy: fail-fast: true matrix: os: [ubuntu-latest] - php: [8.3] + php: ['8.2', 8.3, '8.3', '8.4'] + name: PHP ${{ matrix.php }} - OS ${{ matrix.os }} steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 3 - - name: Setup PHP v${{ matrix.php }} - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: mbstring, exif, iconv, tokenizer, fileinfo, xdebug - coverage: xdebug - - - name: Install dependencies - run: | - composer update --prefer-dist --no-interaction --no-progress - - - name: PHPUnit - run: | - ./vendor/bin/phpunit --stop-on-failure --coverage-clover ./clover.xml - env: - XDEBUG_MODE: coverage - - #- name: Make code coverage badge - # uses: timkrase/phpunit-coverage-badge@v1.2.1 - # with: - # coverage_badge_path: output/coverage.svg - # repo_token: ${{ secrets.GITHUB_TOKEN }} - # push_badge: true - - name: Upload coverage results to Coveralls - env: - COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - composer global require php-coveralls/php-coveralls - php-coveralls --coverage_clover=./clover.xml --json_path=./coverall.xml -v + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 3 + + - name: Setup PHP v${{ matrix.php }} + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: mbstring, exif, iconv, tokenizer, fileinfo, xdebug + coverage: xdebug + + - name: Install dependencies + run: | + composer update --prefer-dist --no-interaction --no-progress + + - name: PHPUnit + run: | + ./vendor/bin/phpunit --stop-on-failure --coverage-clover ./clover.xml + env: + XDEBUG_MODE: coverage + + - name: Upload coverage results to Coveralls + env: + COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + composer global require php-coveralls/php-coveralls + php-coveralls --coverage_clover=./clover.xml --json_path=./coverall.xml -v diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 555dac8..5e994b0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,7 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] php: [7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3] - laravel: ['6.*', '7.*', '8.*', '9.*', '10.*', '11.*'] + laravel: ['6.*', '7.*', '8.*', '9.*', '10.*', '11.*', '12.*'] exclude: - php: 7.2 laravel: 8.* @@ -58,6 +58,16 @@ jobs: php: 8.0 - laravel: 11.* php: 8.1 + - laravel: 12.* + php: 7.2 + - laravel: 12.* + php: 7.3 + - laravel: 12.* + php: 7.4 + - laravel: 12.* + php: 8.0 + - laravel: 12.* + php: 8.1 name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} on ${{ matrix.os }}