From 7a1627b629984df91d635dcb2fbb3cb0a07fea52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= <michal.szoltysek@ez.no>
Date: Thu, 5 Mar 2026 11:44:41 +0100
Subject: [PATCH 1/3] IBX-11328: Updated PHP versions in CI configuration with
 8.3 and 8.4

---
 .github/workflows/ci.yaml | 39 ++++++++++++++-------------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e1023fb6..a3af8c57 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -16,19 +16,14 @@ jobs:
         php:
           - '8.0'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
 
-      - name: Setup PHP Action
-        uses: shivammathur/setup-php@v2
+      - uses: ibexa/gh-workflows/actions/composer-install@main
         with:
-          php-version: ${{ matrix.php }}
-          coverage: none
-          extensions: 'pdo_sqlite, gd'
-          tools: cs2pr
-
-      - uses: "ramsey/composer-install@v1"
-        with:
-          dependency-versions: "highest"
+          gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }}
+          gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
+          satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }}
+          satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }}
 
       - name: Run code style check
         run: composer run-script check-cs -- --format=checkstyle | cs2pr
@@ -44,24 +39,18 @@ jobs:
         php:
           - '7.3'
           - '7.4'
-          - '8.0'
-          - '8.1'
+          - '8.3'
+          - '8.4'
 
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup PHP Action
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          coverage: none
-          extensions: pdo_sqlite, gd
-          tools: cs2pr
+      - uses: actions/checkout@v6
 
-      - uses: "ramsey/composer-install@v1"
+      - uses: ibexa/gh-workflows/actions/composer-install@main
         with:
-          dependency-versions: "highest"
-          composer-options: "--prefer-dist --no-progress"
+          gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }}
+          gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
+          satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }}
+          satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }}
 
       - name: Setup problem matchers for PHPUnit
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

From f02315b5be192d81b01446f866267d9e3994b2c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= <michal.szoltysek@ez.no>
Date: Thu, 5 Mar 2026 12:17:26 +0100
Subject: [PATCH 2/3] PHPStan

---
 .github/workflows/ci.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a3af8c57..77d70bc5 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -55,5 +55,8 @@ jobs:
       - name: Setup problem matchers for PHPUnit
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
+      - name: Run PHPStan analysis
+        run: composer run-script phpstan
+
       - name: Run test suite
         run: composer run-script --timeout=600 test

From 5b07fbedf83557225c2b330a0fde0efe83bf8cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= <michal.szoltysek@ez.no>
Date: Thu, 5 Mar 2026 15:12:27 +0100
Subject: [PATCH 3/3] Fixed PHPStan issues

---
 src/Command/LinkDependenciesCommand.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Command/LinkDependenciesCommand.php b/src/Command/LinkDependenciesCommand.php
index 75bb1dbd..957c478b 100644
--- a/src/Command/LinkDependenciesCommand.php
+++ b/src/Command/LinkDependenciesCommand.php
@@ -48,7 +48,7 @@ class LinkDependenciesCommand extends Command
      */
     private $tokenProvider;
 
-    public function __construct(string $outputDirectory = null, ComposerLocalTokenProvider $tokenProvider = null)
+    public function __construct(?string $outputDirectory = null, ?ComposerLocalTokenProvider $tokenProvider = null)
     {
         parent::__construct();
         $this->serializer = new Serializer([new ObjectNormalizer()], [new JsonEncoder()]);
@@ -170,7 +170,10 @@ private function analyzeDependencies(array $pullRequestUrls): Dependencies
 
         foreach ($pullRequestUrls as $pullRequestUrl) {
             $matches = [];
-            preg_match('/.*github.com\/(.*)\/(.*)\/pull\/(\d+).*/', $pullRequestUrl, $matches);
+            if (preg_match('/.*github.com\/(.*)\/(.*)\/pull\/(\d+).*/', $pullRequestUrl, $matches) !== 1) {
+                // Skip invalid PR URLs
+                continue;
+            }
             [, $owner, $repository, $prNumber] = $matches;
             $prNumber = (int)$prNumber;