diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 134d600..e3da9de 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -3,11 +3,20 @@ name: Lion-Request (CI Workflow) on: push: branches: - - actions + - php-actions pull_request: branches: - - main - - 7.x + - 8.x + paths: + - '.github/workflows/**' + - 'src/**' + - 'tests/**' + - 'composer.json' + - 'composer.lock' + - 'phpunit.xml' + +env: + PHP_VERSION: 8.5 jobs: install-dependencies: @@ -20,7 +29,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.4 + php-version: ${{ env.PHP_VERSION }} extensions: mbstring, gd, zip - name: Install PHP dependencies @@ -33,13 +42,6 @@ jobs: key: php-vendor-${{ runner.os }}-${{ github.run_id }} restore-keys: php-vendor-${{ runner.os }}-${{ github.run_id }} - - name: Cache composer.lock - uses: actions/cache@v4 - with: - path: composer.lock - key: php-composer-lock-${{ runner.os }}-${{ github.run_id }} - restore-keys: php-composer-lock-${{ runner.os }}-${{ github.run_id }} - composer-validation: runs-on: ubuntu-latest name: Composer Validation @@ -52,16 +54,9 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: ${{ env.PHP_VERSION }} extensions: mbstring, gd, zip - - name: Restore composer.lock from cache - uses: actions/cache@v4 - with: - path: composer.lock - key: php-composer-lock-${{ runner.os }}-${{ github.run_id }} - restore-keys: php-composer-lock-${{ runner.os }}-${{ github.run_id }} - - name: Restore vendor directory from cache uses: actions/cache@v4 with: @@ -87,20 +82,13 @@ jobs: pull-requests: write steps: - - name: 'Checkout Repository' + - name: Check out the repository uses: actions/checkout@v4 - - name: Restore composer.lock from cache - uses: actions/cache@v4 - with: - path: composer.lock - key: php-composer-lock-${{ runner.os }}-${{ github.run_id }} - restore-keys: php-composer-lock-${{ runner.os }}-${{ github.run_id }} - - name: Dependency Review uses: actions/dependency-review-action@v4 with: - base-ref: main + base-ref: ${{ github.event.repository.default_branch }} head-ref: ${{ github.sha }} comment-summary-in-pr: true # Possible values: "critical", "high", "moderate", "low" @@ -120,16 +108,9 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: ${{ env.PHP_VERSION }} extensions: mbstring, gd, zip - - name: Restore composer.lock from cache - uses: actions/cache@v4 - with: - path: composer.lock - key: php-composer-lock-${{ runner.os }}-${{ github.run_id }} - restore-keys: php-composer-lock-${{ runner.os }}-${{ github.run_id }} - - name: Restore vendor directory from cache uses: actions/cache@v4 with: @@ -158,8 +139,7 @@ jobs: tests-phpunit: runs-on: ubuntu-latest name: PHPUnit - needs: - - static-code-analysis + needs: static-code-analysis steps: - name: Checkout repository @@ -168,7 +148,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.4 + php-version: ${{ env.PHP_VERSION }} extensions: mbstring, gd, zip, xdebug coverage: xdebug ini-values: | @@ -177,13 +157,6 @@ jobs: xdebug.log_level=0 tools: composer - - name: Restore composer.lock from cache - uses: actions/cache@v4 - with: - path: composer.lock - key: php-composer-lock-${{ runner.os }}-${{ github.run_id }} - restore-keys: php-composer-lock-${{ runner.os }}-${{ github.run_id }} - - name: Restore vendor directory from cache uses: actions/cache@v4 with: @@ -201,10 +174,10 @@ jobs: token: ${{ secrets.CODECOV_TOKEN_LION_REQUEST }} tests-infection: + if: false runs-on: ubuntu-latest name: Infection - needs: - - static-code-analysis + needs: static-code-analysis steps: - name: Checkout repository @@ -213,7 +186,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.4 + php-version: ${{ env.PHP_VERSION }} extensions: mbstring, gd, zip - name: Restore composer.lock from cache diff --git a/Dockerfile b/Dockerfile index a9a528a..c109fde 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.4-apache +FROM php:8.5-apache ARG DEBIAN_FRONTEND=noninteractive # ---------------------------------------------------------------------------------------------------------------------- diff --git a/composer.json b/composer.json index 5148a03..fb41a54 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ } }, "require": { - "php": ">=8.4" + "php": ">=8.5" }, "require-dev": { "lion/test": "^2.0 || ^3.0", diff --git a/composer.lock b/composer.lock index 5148456..878bd3b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b68069e3d2ef201814743e660b9f8ed7", + "content-hash": "bf295aed4e7221490c0f12d1096373a0", "packages": [], "packages-dev": [ { @@ -4997,8 +4997,8 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=8.4" + "php": ">=8.5" }, "platform-dev": {}, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.9.0" }