-
Notifications
You must be signed in to change notification settings - Fork 1
Adds PHPStan to Slack plugin #2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 6 commits
2288928
1811a57
079d54e
eff2eee
8696772
60c76ae
ca92325
700046d
ad666c0
72b9ff1
aa194b2
a24df9c
4be146a
83122ca
592fb1f
4d1a6db
3194ae4
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| #!/bin/bash | ||
|
|
||
| # This hook is called with the following parameters: | ||
| # | ||
| # $1 -- Name of the remote to which the push is being done | ||
| # $2 -- URL to which the push is being done | ||
| # | ||
| # If pushing without using a named remote those arguments will be equal. | ||
| # | ||
| # Information about the commits which are being pushed is supplied as lines to | ||
| # the standard input in the form: | ||
| # | ||
| # <local ref> <local oid> <remote ref> <remote oid> | ||
|
|
||
|
|
||
|
|
||
| ### Check we're running in the context of a plugin and get helpful dir variables ### | ||
|
|
||
| REPO_DIR="$(git rev-parse --show-toplevel)" | ||
| echo "Running pre-commit hook in repo: $REPO_DIR" | ||
|
|
||
| if [[ "$REPO_DIR" =~ /plugins/(.*) ]]; then | ||
| PLUGIN_PATH="plugins/${BASH_REMATCH[1]}" | ||
| else | ||
| echo "Not a plugin, not running any further checks" | ||
| exit 1 | ||
| fi | ||
| MATOMO_DIR=$(echo "$REPO_DIR" | sed -E 's|/plugins/.*$||') | ||
|
|
||
|
|
||
|
|
||
| ### Figure out how to run PHPStan - ddev or not. ### | ||
|
|
||
| COMMAND="" | ||
| # Use local PHP if setup | ||
| if command -v php >/dev/null 2>&1; then | ||
| if "${MATOMO_DIR}/vendor/bin/phpstan" -v 2>&1 > /dev/null; then | ||
| COMMAND="${MATOMO_DIR}/vendor/bin/phpstan" | ||
| fi | ||
| fi | ||
| # Use ddev if setup (overridding local setup) | ||
| if command -v ddev >/dev/null 2>&1; then | ||
| if [ -d "$MATOMO_DIR/.ddev" ]; then | ||
| cd "$MATOMO_DIR" || exit 1 | ||
| if ddev status 2>&1 > /dev/null; then | ||
| COMMAND="ddev exec phpstan" | ||
| fi | ||
| fi | ||
| fi | ||
| # If no command, exit | ||
| if [[ -z "$COMMAND" ]]; then | ||
| echo "No way to run phpstan found." | ||
| exit 1 | ||
| fi | ||
|
|
||
|
|
||
|
|
||
| # Basic setup | ||
| cd "$REPO_DIR" | ||
| STATUS=0 | ||
|
|
||
|
|
||
|
|
||
|
|
||
| ### Run PHPStan on newly created files. ### | ||
|
|
||
| PHPSTAN_CREATED_CONFIG=phpstan/phpstan.created.neon | ||
| if [[ -f "$PHPSTAN_CREATED_CONFIG" ]]; then | ||
| CHANGED_FILES=$(git diff --name-only 5.x-dev...HEAD --diff-filter=A | grep '\.php$' || true) | ||
| if [ -z "$CHANGED_FILES" ]; then | ||
| echo "No created PHP files" | ||
| else | ||
| echo "Running PHPstan at a very high level on new files" | ||
| CHANGED_FILES=`echo "$CHANGED_FILES" | sed -e 's/^\(.*\)$/"\1"/' | xargs -I{} echo "${PLUGIN_PATH}/{}"` | ||
| echo "$CHANGED_FILES" | xargs $COMMAND analyse -c ${PLUGIN_PATH}/${PHPSTAN_CREATED_CONFIG} || STATUS=1 | ||
| fi | ||
| fi | ||
|
|
||
|
|
||
|
|
||
| ### Run PHPStan on modified files. ### | ||
| PHPSTAN_MODIFIED_CONFIG=phpstan/phpstan.modified.neon | ||
| if [[ -f "$PHPSTAN_MODIFIED_CONFIG" ]]; then | ||
| CHANGED_FILES=$(git diff --name-only 5.x-dev...HEAD --diff-filter=CM | grep '\.php$' || true) | ||
| if [ -z "$CHANGED_FILES" ]; then | ||
| echo "No changed PHP files" | ||
| else | ||
| echo "Running PHPstan on modified files" | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removed filtering of files
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That adds the plugin path, and is needed for it to work in ddev. I hope I fixed it for non ddev by putting a "cd" at the start of the script. |
||
| CHANGED_FILES=`echo "$CHANGED_FILES" | sed -e 's/^\(.*\)$/"\1"/' | xargs -I{} echo "${PLUGIN_PATH}/{}"` | ||
| echo "$CHANGED_FILES" | xargs $COMMAND analyse -c ${PLUGIN_PATH}/${PHPSTAN_MODIFIED_CONFIG} || STATUS=1 | ||
| fi | ||
| fi | ||
|
|
||
| # Don't bother running the full check, as we check changes files already, and | ||
| # can assume that the unchanged files don't need rechecking. | ||
| # | ||
| # Github will check this anyway. | ||
| # | ||
| # PHPSTAN_BASE_CONFIG=phpstan.neon | ||
| # if [[ -f "$PHPSTAN_BASE_CONFIG" ]]; then | ||
| # echo "Running PHPstan at a base level on all plugin files" | ||
| # $COMMAND analyse -c ${PLUGIN_PATH}/${PHPSTAN_BASE_CONFIG} || STATUS=1 | ||
| # fi | ||
|
|
||
| exit $STATUS | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| name: PHPStan check | ||
|
|
||
| on: pull_request | ||
|
|
||
| permissions: | ||
| actions: read | ||
| checks: read | ||
| contents: read | ||
| deployments: none | ||
| issues: read | ||
| packages: none | ||
| pull-requests: read | ||
| repository-projects: none | ||
| security-events: none | ||
| statuses: read | ||
|
|
||
| env: | ||
| PLUGIN_NAME: Slack | ||
|
|
||
| jobs: | ||
| phpstan: | ||
| name: PHPStan | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| lfs: false | ||
| persist-credentials: false | ||
| - name: Setup PHP | ||
| uses: shivammathur/setup-php@v2 | ||
| with: | ||
| php-version: '7.2' | ||
|
|
||
| - name: Check out github-action-tests repository | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| repository: matomo-org/github-action-tests | ||
| ref: main | ||
| path: github-action-tests | ||
|
|
||
| - name: checkout matomo for plugin builds | ||
| shell: bash | ||
| run: ${{ github.workspace }}/github-action-tests/scripts/bash/checkout_matomo.sh | ||
| env: | ||
| PLUGIN_NAME: ${{ env.PLUGIN_NAME }} | ||
| WORKSPACE: ${{ github.workspace }} | ||
| ACTION_PATH: ${{ github.workspace }}/github-action-tests | ||
| MATOMO_TEST_TARGET: maximum_supported_matomo | ||
|
|
||
| - name: prepare setup | ||
| shell: bash | ||
| run: | | ||
| cd ${{ github.workspace }}/matomo | ||
| echo -e "composer install" | ||
| composer install --ignore-platform-reqs | ||
|
|
||
| - name: checkout additional plugins | ||
| if: ${{ env.DEPENDENT_PLUGINS != '' }} | ||
| shell: bash | ||
| working-directory: ${{ github.workspace }}/matomo | ||
| run: ${{ github.workspace }}/github-action-tests/scripts/bash/checkout_dependent_plugins.sh | ||
|
|
||
| env: | ||
| GITHUB_USER_TOKEN: ${{ secrets.TESTS_ACCESS_TOKEN || secrets.GITHUB_TOKEN }} | ||
|
|
||
| - name: "Restore result cache" | ||
| uses: actions/cache/restore@v4 | ||
| with: | ||
| path: /tmp/phpstan # same as in phpstan.neon | ||
| key: "phpstan-result-cache-${{ github.run_id }}" | ||
| restore-keys: | | ||
| phpstan-result-cache- | ||
|
|
||
| - name: PHPStan whole repo | ||
| id: phpstan-all | ||
| run: cd ${{ github.workspace }}/matomo && composer run phpstan -- -vvv -c plugins/${{ env.PLUGIN_NAME }}/phpstan.neon | ||
|
|
||
| - name: "Save result cache" | ||
| uses: actions/cache/save@v4 | ||
| if: ${{ !cancelled() }} | ||
| with: | ||
| path: /tmp/phpstan # same as in phpstan.neon | ||
| key: "phpstan-result-cache-${{ github.run_id }}" |
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,21 @@ | ||||||
| parameters: | ||||||
| level: 5 | ||||||
| phpVersion: 70200 | ||||||
| tmpDir: /tmp/phpstan/Slack/main | ||||||
| paths: | ||||||
| - . | ||||||
| excludePaths: | ||||||
| - tests/* | ||||||
| - github-action-tests | ||||||
| bootstrapFiles: | ||||||
| - ../../bootstrap-phpstan.php | ||||||
| universalObjectCratesClasses: | ||||||
| - Piwik\Config | ||||||
| - Piwik\View | ||||||
| - Piwik\ViewDataTable\Config | ||||||
| scanDirectories: | ||||||
| # ../../ does not actually seem to give us anything | ||||||
| # that ../plugins/ does not, but including it for | ||||||
| # completeness. It does not seem to slow down performance. | ||||||
| - ../../ | ||||||
|
||||||
| - ../../ | |
| - . |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| includes: | ||
| - ../phpstan.neon | ||
| parameters: | ||
| level: 8 | ||
| tmpDir: /tmp/phpstan/Slack/created |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| includes: | ||
| - ../phpstan.neon | ||
| parameters: | ||
| level: 1 | ||
| tmpDir: /tmp/phpstan/Slack/modified |

There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed filtering of changed files
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That adds the plugin path, and is needed for it to work in ddev. I hope I fixed it for non ddev by putting a "cd" at the start of the script.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I removed it because of cd