diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index c7806ef..cf652bf 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -1,42 +1,18 @@ -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" - } 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; } diff --git a/phpcs.xml b/phpcs.xml deleted file mode 100644 index 37e0e27..0000000 --- a/phpcs.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - ./ - - vendor/* - - - - - - - - -