From ce02160fae001eb9ca2ae2f8e85d11845560b618 Mon Sep 17 00:00:00 2001
From: Sukhwinder Dhillon <sukhwinder33445@gmail.com>
Date: Mon, 15 Dec 2025 11:49:14 +0100
Subject: [PATCH 1/4] GitHub Actions: Use new PHP workflow

- Remove obsolete workflow trigger for `release/*` branch pushes
- Run workflow on push to branch `support/*`
---
 .github/workflows/php.yml     | 42 +++++++++--------------------------
 .github/workflows/phpstan.yml | 16 -------------
 2 files changed, 10 insertions(+), 48 deletions(-)
 delete mode 100644 .github/workflows/phpstan.yml

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index c7806ef..a5ccd5a 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -1,42 +1,20 @@
-name: PHP Tests
+name: CI
 
 on:
   push:
     branches:
       - main
-      - release/*
+      - support/*
   pull_request:
     branches:
       - main
 
 jobs:
-  lint:
-    name: Static analysis for php ${{ matrix.php }} on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
-        os: ['ubuntu-latest']
-
-    steps:
-      - name: Checkout code base
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          tools: phpcs
-
-      - name: Setup dependencies
-        run: composer require -n --no-progress overtrue/phplint
-
-      - name: PHP Lint
-        if: ${{ ! cancelled() }}
-        run: ./vendor/bin/phplint -n --exclude={^vendor/.*} -- .
-
-      - name: PHP CodeSniffer
-        if: ${{ ! cancelled() }}
-        run: phpcs -wps --colors
+  php:
+    name: PHP
+    uses: Icinga/github-actions/.github/workflows/php.yml@main
+    with:
+      dependencies: |
+        {
+          "./vendor/icingaweb2-modules/icingadb" : "https://github.com/Icinga/icingadb-web.git"
+        }
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
deleted file mode 100644
index c82d48a..0000000
--- a/.github/workflows/phpstan.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: PHPStan
-
-on:
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  phpstan:
-    uses: icinga/github-actions/.github/workflows/phpstan.yml@main
-    with:
-      dependencies: |
-        {
-          "/icingaweb2"                             : "https://github.com/Icinga/icingaweb2.git",
-          "/usr/share/icingaweb2-modules/icingadb"  : "https://github.com/Icinga/icingadb-web.git"
-        }

From 59bb74a539dc66472be24088f519bcee5994ee0c Mon Sep 17 00:00:00 2001
From: Sukhwinder Dhillon <sukhwinder33445@gmail.com>
Date: Mon, 15 Dec 2025 11:52:24 +0100
Subject: [PATCH 2/4] Remove `phpcs.xml`

Use default from new workflow.
---
 phpcs.xml | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 phpcs.xml

diff --git a/phpcs.xml b/phpcs.xml
deleted file mode 100644
index 37e0e27..0000000
--- a/phpcs.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="PSR12">
-    <!-- Test all PHP files except those in vendor/ -->
-    <file>./</file>
-    <arg name="extensions" value="php"/>
-    <exclude-pattern>vendor/*</exclude-pattern>
-
-    <arg name="report-width" value="auto"/>
-    <arg name="report-full"/>
-    <arg name="report-gitblame"/>
-    <arg name="report-summary"/>
-    <arg name="encoding" value="UTF-8"/>
-
-    <rule ref="PSR12"/>
-</ruleset>

From 554ecd996772ac484f8256ab8d5613c8b29b593e Mon Sep 17 00:00:00 2001
From: Sukhwinder Dhillon <sukhwinder33445@gmail.com>
Date: Mon, 15 Dec 2025 12:16:47 +0100
Subject: [PATCH 3/4] GitHub Actions: Run in any pull request

Allow GitHub Actions to run for every pull request instead of only main-based pull requests
---
 .github/workflows/php.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index a5ccd5a..cf652bf 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -6,8 +6,6 @@ on:
       - main
       - support/*
   pull_request:
-    branches:
-      - main
 
 jobs:
   php:

From bcac72e60e29ff15fd537f9eab9e96e6873d8111 Mon Sep 17 00:00:00 2001
From: Sukhwinder Dhillon <sukhwinder33445@gmail.com>
Date: Mon, 15 Dec 2025 15:16:43 +0100
Subject: [PATCH 4/4] Align coding style to comply with latest PSR

---
 library/Graphite/Web/Widget/GraphImage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Graphite/Web/Widget/GraphImage.php b/library/Graphite/Web/Widget/GraphImage.php
index e99bf09..4206e10 100644
--- a/library/Graphite/Web/Widget/GraphImage.php
+++ b/library/Graphite/Web/Widget/GraphImage.php
@@ -90,7 +90,7 @@ class GraphImage extends AbstractWidget
             $allVars = [];
 
             foreach ($template->getCurves() as $curveName => $curve) {
-                if (!isset($metrics[$curveName])) {
+                if (! isset($metrics[$curveName])) {
                     continue;
                 }