Skip to content

Commit

Permalink
Update build deps and PHPStorm analysis tweaks (#53)
Browse files Browse the repository at this point in the history
* feature: deeper dynamic pages
closes #4

* build: upgrade build packages for downstream deps

* tweak: phpstorm analysis

* test: remove scrutinizer

* test: move phpunit config

* test: upgrade phpunit

* ci: upgrade ci config
  • Loading branch information
g105b authored Jul 20, 2023
1 parent e00c1e0 commit 3390be9
Show file tree
Hide file tree
Showing 13 changed files with 1,877 additions and 464 deletions.
128 changes: 116 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,45 @@ on: [push]
jobs:
composer:
runs-on: ubuntu-latest
strategy:
matrix:
php: [ 8.0, 8.1, 8.2 ]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Cache Composer dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: /tmp/composer-cache
key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}

- uses: php-actions/composer@v6
- name: Composer install
uses: php-actions/composer@v6
with:
php_version: ${{ matrix.php }}

- name: Archive build
run: mkdir /tmp/github-actions/ && tar -cvf /tmp/github-actions/build.tar ./

- name: Upload build archive for test runners
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: build-artifact
path: /tmp/github-actions

phpunit:
runs-on: ubuntu-latest
needs: [composer]
needs: [ composer ]
strategy:
matrix:
php: [ 8.0, 8.1, 8.2 ]

outputs:
coverage: ${{ steps.store-coverage.outputs.coverage_text }}

steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: build-artifact
path: /tmp/github-actions
Expand All @@ -41,18 +53,47 @@ jobs:

- name: PHP Unit tests
uses: php-actions/phpunit@v3
env:
XDEBUG_MODE: cover
with:
php_version: 8.0
php_version: ${{ matrix.php }}
php_extensions: xdebug
configuration: test/phpunit/phpunit.xml
bootstrap: vendor/autoload.php
coverage_text: _coverage/coverage.txt
coverage_clover: _coverage/clover.xml

- name: Store coverage data
uses: actions/upload-artifact@v3
with:
name: code-coverage
path: _coverage

coverage:
runs-on: ubuntu-latest
needs: [ phpunit ]

steps:
- uses: actions/checkout@v3

- uses: actions/download-artifact@v3
with:
name: code-coverage
path: _coverage

- name: Output coverage
run: cat "_coverage/coverage.txt"

- name: Upload to Codecov
uses: codecov/codecov-action@v3

phpstan:
runs-on: ubuntu-latest
needs: [composer]
needs: [ composer ]
strategy:
matrix:
php: [ 8.0, 8.1, 8.2 ]

steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: build-artifact
path: /tmp/github-actions
Expand All @@ -63,5 +104,68 @@ jobs:
- name: PHP Static Analysis
uses: php-actions/phpstan@v3
with:
php_version: ${{ matrix.php }}
path: src/
level: 6

# TODO: Uncomment these once phpms and phpcs are happy https://github.com/PhpGt/Routing/pull/53
# phpmd:
# runs-on: ubuntu-latest
# needs: [ composer ]
# strategy:
# matrix:
# php: [ 8.0, 8.1, 8.2 ]
#
# steps:
# - uses: actions/download-artifact@v3
# with:
# name: build-artifact
# path: /tmp/github-actions
#
# - name: Extract build archive
# run: tar -xvf /tmp/github-actions/build.tar ./
#
# - name: PHP Mess Detector
# uses: php-actions/phpmd@v1
# with:
# php_version: ${{ matrix.php }}
# path: src/
# output: text
# ruleset: phpmd.xml
#
# phpcs:
# runs-on: ubuntu-latest
# needs: [ composer ]
# strategy:
# matrix:
# php: [ 8.0, 8.1, 8.2 ]
#
# steps:
# - uses: actions/download-artifact@v3
# with:
# name: build-artifact
# path: /tmp/github-actions
#
# - name: Extract build archive
# run: tar -xvf /tmp/github-actions/build.tar ./
#
# - name: PHP Code Sniffer
# uses: php-actions/phpcs@v1
# with:
# php_version: ${{ matrix.php }}
# path: src/
# standard: phpcs.xml

remove_old_artifacts:
runs-on: ubuntu-latest

steps:
- name: Remove old artifacts for prior workflow runs on this repository
env:
GH_TOKEN: ${{ github.token }}
run: |
gh api "/repos/${{ github.repository }}/actions/artifacts?name=build-artifact" | jq ".artifacts[] | select(.name == \"build-artifact\") | .id" > artifact-id-list.txt
while read id
do
echo -n "Deleting artifact ID $id ... "
gh api --method DELETE /repos/${{ github.repository }}/actions/artifacts/$id && echo "Done"
done <artifact-id-list.txt
32 changes: 0 additions & 32 deletions .scrutinizer.yml

This file was deleted.

12 changes: 7 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@
"require": {
"php": ">=8.0",
"phpgt/typesafegetter": "^1.2.2",
"phpgt/config": "^v1.1.0",
"phpgt/http": "^v1",
"phpgt/config": "^1.1.0",
"phpgt/http": "^1",
"phpgt/servicecontainer": "1.*",
"psr/http-message": "1.*",
"psr/http-message": "^2",

"willdurand/negotiation": "^3.0"
},

"require-dev": {
"phpunit/phpunit": "^9.5",
"phpstan/phpstan": "^1.2"
"phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^10.2",
"phpmd/phpmd": "^2.13",
"squizlabs/php_codesniffer": "^3.7"
},

"license": "MIT",
Expand Down
Loading

0 comments on commit 3390be9

Please sign in to comment.