Merge pull request #16 from meritoo/chore/bump-php-to-8.2

Bump minimum PHP version: `8.0` -> `8.2`
meritoo · Nov 16, 2024 · 4b389c5 · 4b389c5
2 parents ca1bd21 + 51fde1a
commit 4b389c5
Show file tree

Hide file tree

Showing 3 changed files with 138 additions and 144 deletions.
diff --git a/.github/workflows/verify-stability.yaml b/.github/workflows/verify-stability.yaml
@@ -1,143 +1,143 @@
 name: Verify stability
 
 on:
-  push:
-    branches:
-      - master
-  pull_request:
+    push:
+        branches:
+            - master
+    pull_request:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
 
 permissions:
-  contents: read
+    contents: read
 
 jobs:
-  Validate:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        php-versions: [ '8.0', '8.1', '8.2' ]
-    env:
-      extensions: dom, fileinfo, intl, json, pcre, simplexml
-      key: cache-v1 # can be any string, change to clear the extension cache.
-    steps:
-      - name: Hello
-        run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
-      - name: Checkout branch
-        uses: actions/checkout@v4
-      - name: Setup cache environment
-        id: extcache
-        uses: shivammathur/cache-extensions@v1
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-          key: ${{ env.key }}
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-      - name: Validate Composer (composer.json and composer.lock)
-        uses: php-actions/composer@v6
-        with:
-          php_version: ${{ matrix.php-versions }}
-          php_extensions: intl
-          command: validate --strict --no-check-publish
-      - name: Cache Composer dependencies
-        id: composer-cache
-        uses: actions/cache@v4
-        with:
-          path: /tmp/composer-cache
-          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-php-
-      - name: Install Composer dependencies
-        uses: php-actions/composer@v6
-        with:
-          php_version: ${{ matrix.php-versions }}
-          php_extensions: intl
-          dev: no
-  PHPStan:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        php-versions: [ '8.0', '8.1', '8.2' ]
-    env:
-      extensions: dom, fileinfo, intl, json, pcre, simplexml
-      key: cache-v1 # can be any string, change to clear the extension cache.
-    needs: [ Validate ]
-    if: needs.Validate.result == 'success'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup cache environment
-        id: extcache
-        uses: shivammathur/cache-extensions@v1
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-          key: ${{ env.key }}
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-      - name: Install Composer dependencies
-        uses: php-actions/composer@v6
-        with:
-          php_version: ${{ matrix.php-versions }}
-          php_extensions: intl
-      - name: Analyse code with PHPStan
-        run: vendor/bin/phpstan analyse --memory-limit 256M
-  PHPUnit:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        php-versions: [ '8.0', '8.1', '8.2' ]
-    env:
-      extensions: dom, fileinfo, intl, json, pcre, simplexml
-      key: cache-v1 # can be any string, change to clear the extension cache.
-    needs: [ PHPStan ]
-    if: needs.PHPStan.result == 'success'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup cache environment
-        id: extcache
-        uses: shivammathur/cache-extensions@v1
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-          key: ${{ env.key }}
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-      - name: Install locales
-        run: |
-          sudo apt-get update \
-          && sudo apt-get install -y --no-install-recommends --fix-missing \
-              locales
-      - name: Generate locales
-        run: |
-          sudo sed -i "s/^# de_DE/de_DE/g; \
-              s/^# es_ES/es_ES/g; \
-              s/^# en_GB/en_GB/g; \
-              s/^# en_US/en_US/g; \
-              s/^# fr_FR/fr_FR/g; \
-              s/^# it_IT/it_IT/g; \
-              s/^# pl_PL/pl_PL/g; \
-              s/^# ru_RU/ru_RU/g;" /etc/locale.gen \
-          && sudo locale-gen
-      - name: Install Composer dependencies
-        uses: php-actions/composer@v6
-        with:
-          php_version: ${{ matrix.php-versions }}
-          php_extensions: intl
-      - name: Run PHPUnit tests
-        run: vendor/bin/phpunit --no-coverage
-      - name: Bye 👋
-        run: echo "🍏 This job's status is ${{ job.status }}."
+    Validate:
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                php-versions: [ '8.0', '8.1', '8.2' ]
+        env:
+            extensions: dom, fileinfo, intl, json, pcre, simplexml
+            key: cache-v1 # can be any string, change to clear the extension cache.
+        steps:
+            -   name: Hello
+                run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
+            -   name: Checkout branch
+                uses: actions/checkout@v4
+            -   name: Setup cache environment
+                id: extcache
+                uses: shivammathur/cache-extensions@v1
+                with:
+                    php-version: ${{ matrix.php-versions }}
+                    extensions: ${{ env.extensions }}
+                    key: ${{ env.key }}
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php-versions }}
+                    extensions: ${{ env.extensions }}
+            -   name: Validate Composer (composer.json and composer.lock)
+                uses: php-actions/composer@v6
+                with:
+                    php_version: ${{ matrix.php-versions }}
+                    php_extensions: intl
+                    command: validate --strict --no-check-publish
+            -   name: Cache Composer dependencies
+                id: composer-cache
+                uses: actions/cache@v4
+                with:
+                    path: /tmp/composer-cache
+                    key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+                    restore-keys: |
+                        ${{ runner.os }}-php-
+            -   name: Install Composer dependencies
+                uses: php-actions/composer@v6
+                with:
+                    php_version: ${{ matrix.php-versions }}
+                    php_extensions: intl
+                    dev: no
+    PHPStan:
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                php-versions: [ '8.0', '8.1', '8.2' ]
+        env:
+            extensions: dom, fileinfo, intl, json, pcre, simplexml
+            key: cache-v1 # can be any string, change to clear the extension cache.
+        needs: [ Validate ]
+        if: needs.Validate.result == 'success'
+        steps:
+            -   name: Checkout
+                uses: actions/checkout@v4
+            -   name: Setup cache environment
+                id: extcache
+                uses: shivammathur/cache-extensions@v1
+                with:
+                    php-version: ${{ matrix.php-versions }}
+                    extensions: ${{ env.extensions }}
+                    key: ${{ env.key }}
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php-versions }}
+                    extensions: ${{ env.extensions }}
+            -   name: Install Composer dependencies
+                uses: php-actions/composer@v6
+                with:
+                    php_version: ${{ matrix.php-versions }}
+                    php_extensions: intl
+            -   name: Analyse code with PHPStan
+                run: vendor/bin/phpstan analyse --memory-limit 256M
+    PHPUnit:
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                php-versions: [ '8.0', '8.1', '8.2' ]
+        env:
+            extensions: dom, fileinfo, intl, json, pcre, simplexml
+            key: cache-v1 # can be any string, change to clear the extension cache.
+        needs: [ PHPStan ]
+        if: needs.PHPStan.result == 'success'
+        steps:
+            -   name: Checkout
+                uses: actions/checkout@v4
+            -   name: Setup cache environment
+                id: extcache
+                uses: shivammathur/cache-extensions@v1
+                with:
+                    php-version: ${{ matrix.php-versions }}
+                    extensions: ${{ env.extensions }}
+                    key: ${{ env.key }}
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php-versions }}
+                    extensions: ${{ env.extensions }}
+            -   name: Install locales
+                run: |
+                    sudo apt-get update \
+                    && sudo apt-get install -y --no-install-recommends --fix-missing \
+                        locales
+            -   name: Generate locales
+                run: |
+                    sudo sed -i "s/^# de_DE/de_DE/g; \
+                        s/^# es_ES/es_ES/g; \
+                        s/^# en_GB/en_GB/g; \
+                        s/^# en_US/en_US/g; \
+                        s/^# fr_FR/fr_FR/g; \
+                        s/^# it_IT/it_IT/g; \
+                        s/^# pl_PL/pl_PL/g; \
+                        s/^# ru_RU/ru_RU/g;" /etc/locale.gen \
+                    && sudo locale-gen
+            -   name: Install Composer dependencies
+                uses: php-actions/composer@v6
+                with:
+                    php_version: ${{ matrix.php-versions }}
+                    php_extensions: intl
+            -   name: Run PHPUnit tests
+                run: vendor/bin/phpunit --no-coverage
+            -   name: Bye 👋
+                run: echo "🍏 This job's status is ${{ job.status }}."
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.2",
         "ext-dom": "*",
         "ext-fileinfo": "*",
         "ext-intl": "*",

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,9 +1,6 @@
 services:
-    #
-    # Required to run project
-    #
     php:
-        image: meritoo/php:8.0
+        image: meritoo/php:8.2
         container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-php
         entrypoint: php
         command: -S 0.0.0.0:9999
@@ -12,16 +9,13 @@ services:
         volumes:
             - .:/var/www/application:cached
     composer:
-        image: meritoo/php:8.0
+        image: meritoo/php:8.2
         container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-composer
         entrypoint: php -d memory_limit=-1 /usr/local/bin/composer
         volumes:
             - .:/var/www/application:cached
-    #
-    # Required to run PHPUnit's tests
-    #
     phpunit:
-        image: meritoo/php:8.0
+        image: meritoo/php:8.2
         container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-phpunit
         entrypoint: ./vendor/bin/phpunit
         command: --version