Replacing Psalm with PHPStan (#546)

Co-authored-by: Maksim Spirkov <63721828+mspirkov@users.noreply.github.com>

Author: s1lver

.dockerignore

@@ -2,7 +2,6 @@
 /.git
 /.dockerignore
 /.editorconfig
-/.env.example
 /.gitattributes
 /.github
 /.gitignore

.editorconfig

@@ -18,4 +18,7 @@ trim_trailing_whitespace = false
 indent_style = tab
 
 [*.yml]
+indent_size = 2
+
+[*.neon]
 indent_size = 2

.env.example

@@ -2,8 +2,10 @@
 .*                  export-ignore
 *.dist              export-ignore
 *.xml               export-ignore
+*.yml               export-ignore
 /docs               export-ignore
 /tests              export-ignore
 /Makefile           export-ignore
+/Dockerfile         export-ignore
 /support            export-ignore
 /stubs              export-ignore

.gitattributes

@@ -18,7 +18,9 @@ on:
       - '.gitattributes'
       - '.editorconfig'
       - 'docker-compose.yml'
+      - 'Dockerfile'
       - 'Makefile'
+      - 'phpunit.xml.dist'
 
   push: *ignore-paths
 

.github/workflows/linter.yml

@@ -14,14 +14,12 @@ on:
       - '.gitignore'
       - '.gitattributes'
       - '.editorconfig'
+      - 'phpunit.xml.dist'
 
   push:
     branches: [ 'master' ]
     paths-ignore: *ignore-paths
 
-env:
-  COMPOSE_PROJECT_NAME: yii2-queue
-  COMPOSE_FILE: tests/docker-compose.yml
 jobs:
   phpunit:
     name: PHP ${{ matrix.php }}

.github/workflows/main.yml

@@ -1,6 +1,11 @@
+name: static analysis
+
+permissions:
+  contents: read
+
 on:
-  pull_request:
-    paths-ignore: &ignore-paths
+  pull_request: &ignore-paths
+    paths-ignore:
       - 'docs/**'
       - '.github/CONTRIBUTING.md'
       - '.github/FUNDING.yml'
@@ -12,31 +17,15 @@ on:
       - '.gitignore'
       - '.gitattributes'
       - '.editorconfig'
+      - 'docker-compose.yml'
+      - 'Dockerfile'
+      - 'Makefile'
       - 'phpunit.xml.dist'
 
-  push:
-    branches: [ 'master' ]
-    paths-ignore: *ignore-paths
+  push: *ignore-paths
 
-name: static analysis
-
-permissions:
-  contents: read
-
-env:
-  COMPOSE_PROJECT_NAME: yii2-queue
-  COMPOSE_FILE: tests/docker-compose.yml
 jobs:
-  psalm:
-    name: PHP ${{ matrix.php }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        php: [ '8.3', '8.4', '8.5' ]
-    steps:
-      - name: Checkout.
-        uses: actions/checkout@v2
-
-      - name: Run static analyzes for PHP ${{ matrix.php }}
-        run: make static-analyze v=${{ matrix.php }}
+  phpstan:
+    uses: yiisoft/yii2-actions/.github/workflows/phpstan.yml@master
+    with:
+      extensions: amqp

.github/workflows/static.yml

@@ -17,9 +17,9 @@ composer.lock
 # PHP CS Fixer
 .php_cs.cache
 
-# Env variables
-.env
-
 # PHP Unit cache
 .phpunit.result.cache
 .phpunit.cache
+coverage.xml
+
+runtime

.gitignore

@@ -4,7 +4,7 @@ Yii2 Queue Extension Change Log
 3.0.0 under development
 ---
 - Enh #542: The minimum supported PHP version is 8.3 (@s1lver)
-- Enh #503: Added PSALM for static code analysis. Error level set to 1 (@s1lver)
+- Enh #503, #546: Added PHPStan for static code analysis. Error level set to 8 (@s1lver)
 - Enh #503: Added strict typing (@s1lver)
 - Enh #542: The `pda/pheanstalk` package of the Beanstalk driver has been updated to version 8.* (@s1lver)
 - Enh #503: Removed deprecated interfaces `RetryableJob`, `Job`, `Serializer` (@s1lver)

CHANGELOG.md

@@ -32,5 +32,5 @@ COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 COPY . /code
 WORKDIR /code
 
-ENTRYPOINT ["tests/docker/php/entrypoint.sh"]
+ENTRYPOINT ["tests/docker/entrypoint.sh"]
 CMD ["sleep", "infinity"]