Merge pull request #179 from reload/dependabot/docker/v2/composer-8bb…

…df5c
reload · Nov 22, 2024 · 1bcf01e · 1bcf01e
2 parents 907ebf2 + c4d32e8
commit 1bcf01e
Show file tree

Hide file tree

Showing 4 changed files with 287 additions and 259 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -2,15 +2,26 @@ on: pull_request
 name: Check and lint
 
 jobs:
+  php_version:
+    name: Lookup PHP version
+    runs-on: ubuntu-latest
+    outputs:
+      php_version: ${{ env.php_version }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Lookup PHP version
+        run: echo "php_versions=$(jq -r .config.platform.php)" >> "$GITHUB_ENV"
+
   review_codestyle:
     name: Codestyle
     runs-on: ubuntu-latest
+    needs: php_version
     steps:
       - uses: actions/checkout@v4
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@master
         with:
-          php-version: 8.2
+          php-version: ${{ needs.php_version.outputs.php_version }}
           coverage: none
       - name: Install Dependencies
         run: composer install --no-interaction --no-progress
@@ -22,16 +33,17 @@ jobs:
   static_code_analysis:
     name: Static Code Analysis
     runs-on: ubuntu-latest
+    needs: php_version
     steps:
       - uses: actions/checkout@v4
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@master
         with:
-          php-version: 8.2
+          php-version: ${{ needs.php_version.outputs.php_version }}
           coverage: none
       - name: Install Reviewdog
         run: |
-          wget -O - -q https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh| sh -s -- -b $PWD/ latest
+          wget -O - -q https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh| sh -s -- -b "$PWD/" latest
       - name: Install Dependencies
         run: |
           composer install --no-interaction --no-progress
@@ -44,12 +56,13 @@ jobs:
   unit_tests:
     name: PHPUnit tests
     runs-on: ubuntu-latest
+    needs: php_version
     steps:
       - uses: actions/checkout@v4
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@master
         with:
-          php-version: 8.2
+          php-version: ${{ needs.php_version.outputs.php_version }}
           coverage: none
       - name: Install Dependencies
         run: |

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM composer:2.8.3@sha256:3e409c6df20d7d8b644f72467d54f203efd6b2695c6345d363abd1ca9a80c4c2 AS build-env
+FROM composer:2.8.3@sha256:8bbdf5ccb6c6ddd23c578cf0e80243b42addabc07f9d421f617a166e9afe84f5 AS build-env
 
 ENV PHP_EXTENSIONS="bcmath intl xsl"
 
@@ -13,7 +13,7 @@ WORKDIR /opt/drupal-security-jira
 
 RUN composer install --prefer-dist --no-dev
 
-FROM php:8.3.7-alpine3.18@sha256:3da837b84db645187ae2f24ca664da3faee7c546f0e8d930950b12d24f0d8fa0
+FROM php:8.4.1-alpine3.20@sha256:38611113a7443402e0420649d3eb56bb7593a47d962bb42f8ebff62107c8d358
 
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 # hadolint ignore=SC2086

diff --git a/composer.json b/composer.json
@@ -6,12 +6,12 @@
         "symfony/console": "^5.3",
         "symfony/http-client": "^6.3",
         "ext-openssl": "*",
-        "veewee/xml": "^2.12",
+        "veewee/xml": "^4",
         "reload/jira-security-issue": "^2",
         "composer/semver": "^3.3",
         "thecodingmachine/safe": "^2.5",
         "vlucas/phpdotenv": "^5.5",
-        "azjezz/psl": "^2.8"
+        "azjezz/psl": "^3.1"
     },
     "license": "MIT",
     "autoload": {
@@ -29,6 +29,9 @@
         "phpstan/phpstan-phpunit": "^1.3"
     },
     "config": {
+	"platform": {
+	    "php": "8.4"
+	},
         "allow-plugins": {
             "phpro/grumphp-shim": true,
             "phpstan/extension-installer": true