Updated composer dependencies, recipes, PHPStorm configuration, Qodana, docs.

Author: DKravtsov

.circleci/config.yml

@@ -44,24 +44,24 @@ jobs:
             make phpcs
 
       - run:
-          name: Run PHP copy/paste detector
+          name: Run PHPStan
           command: |
-            make phpcpd
+            make phpstan
 
       - run:
-          name: Run PHP mess detector
+          name: Run PHPInsights
           command: |
-            make phpmd
+            make phpinsights
 
       - run:
-          name: Run PHPStan static analysis tool
+          name: Run PHP Mess Detector
           command: |
-            make phpstan
+            make phpmd
 
       - run:
-          name: Run Phpinsights PHP quality checks
+          name: Run PHP copy past detector
           command: |
-            make phpinsights
+            make phpcpd
 
       - store_artifacts:
           path: reports

.dockerignore

@@ -1,15 +1,23 @@
+### User-specific stuff:
 /.git*
-/.idea*
+/.idea/workspace.xml
 .dockerignore
-.editorconfig
+
+### Other data
 storage/mysql-data
 vendor/
-/tools/*/vendor/
 bootstrap/cache
 !bootstrap/cache/.gitignore
 .phpstorm.meta.php
-Dockerfile
 _ide_helper.php
+
+### Vendor bin dependencies
+/tools/*/vendor/
+.phpunit.cache
+.phpunit.result.cache
+
+### Docker
+Dockerfile
 docker-compose.yml
 docker-compose-test-ci.yml
 docker-compose-staging.yml

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     build:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v4
             - name: Build the docker images
               run: make build-test
             - name: Start the docker images
@@ -33,33 +33,48 @@ jobs:
               run: make info
             - name: Run test suite
               run: make phpunit
-            - name: Run PHP coding standard
+            - name: Archive coverage data for Qodana
+              uses: actions/upload-artifact@v3
+              with:
+                  name: php-coverage-data
+                  path: reports/clover.xml
+            - name: Run coding standard
               run: make ecs
-            - name: Run PHP codeSniffer
+            - name: Run codeSniffer
               run: make phpcs
-            - name: Run PHP copy/paste detector
-              run: make phpcpd
-            - name: Run PHP mess detector
-              run: make phpmd
-            - name: Run PHPStan static analysis tool
+            - name: Run PHPStan
               run: make phpstan
-            - name: Run Phpinsights PHP quality checks
+            - name: Run PHPInsights
               run: make phpinsights
+            - name: Run php mess detector
+              run: make phpmd
+            - name: Run php copy past detector
+              run: make phpcpd
             - name: Stop the docker images
               run: make stop-test
-    qodana:
-        runs-on: ubuntu-latest
-        needs: build
-        permissions:
-            contents: write
-            pull-requests: write
-            checks: write
-        steps:
-            - uses: actions/checkout@v3
-              with:
-                  ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
-                  fetch-depth: 0  # a full history is required for pull request analysis
-            - name: 'Qodana Scan'
-              uses: JetBrains/[email protected]
-              env:
-                  QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
+
+# Currently local Qodana report differ from CI Qodana report due to some issues https://youtrack.jetbrains.com/issue/QD-7379
+#    qodana:
+#        runs-on: ubuntu-20.04
+#        needs: build
+#        permissions:
+#            contents: write
+#            pull-requests: write
+#            checks: write
+#        steps:
+#            - uses: actions/checkout@v4
+#              with:
+#                  ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
+#                  fetch-depth: 0  # a full history is required for pull request analysis
+#                  php-version: '8.2'
+#            - name: 'Install dependencies'
+#              run: COMPOSER_MEMORY_LIMIT=-1 composer install
+#            - name: 'Download coverage data for Qodana'
+#              uses: actions/download-artifact@v3
+#              with:
+#                  name: php-coverage-data
+#                  path: .qodana/code-coverage
+#            - name: 'Qodana Scan'
+#              uses: JetBrains/[email protected]
+#              env:
+#                  QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}

.gitignore

@@ -1,4 +1,7 @@
-/.idea
+reports/*
+!reports/.gitkeep
+
+###> laravel ###
 /.vscode
 /.vagrant
 /node_modules
@@ -16,12 +19,15 @@ auth.json
 _ide_helper.php
 .phpstorm.meta.php
 _ide_helper_models.php
-reports/*
-!reports/.gitkeep
 npm-debug.log
 yarn-error.log
+###< laravel ###
+
+###> phpunit ###
 .phpunit.result.cache
 .phpunit.cache
+###< phpunit ###
+
 ###> friendsofphp/php-cs-fixer ###
 .php-cs-fixer.cache
 .php_cs

.gitlab-ci.yml

@@ -33,10 +33,10 @@ build:
     - make phpunit
     - make ecs
     - make phpcs
-    - make phpcpd
-    - make phpmd
     - make phpstan
     - make phpinsights
+    - make phpmd
+    - make phpcpd
     - make stop-test
   artifacts:
     paths: