Updated github actions

Author: pmishev

.env

@@ -1,5 +1,5 @@
 # Override for the ES port to use for the docker container
-ELASTICSEARCH_PORT=9201
+ELASTICSEARCH_PORT=9205
 
 # Override for the ES version to use for the docker container
 #ELASTICSEARCH_VERSION=8.8.0

.github/workflows/phpunit-tests.yml

@@ -7,7 +7,7 @@ concurrency:
 on: ['push', 'pull_request', 'workflow_dispatch']
 
 env:
-    ELASTICSEARCH_PORT: 9201
+    ELASTICSEARCH_PORT: 9205
 
 jobs:
     static_code_analysis:
@@ -26,7 +26,7 @@ jobs:
               run: composer validate
 
             - name: 'Install dependencies with Composer'
-              uses: 'ramsey/composer-install@v2'
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: 'highest'
                   composer-options: '--prefer-dist'
@@ -105,7 +105,7 @@ jobs:
               run: composer require --no-update symfony/framework-bundle:${{ matrix.symfony }}
 
             - name: 'Install dependencies with Composer'
-              uses: 'ramsey/composer-install@v2'
+              uses: ramsey/composer-install@v3
               with:
                   dependency-versions: '${{ matrix.dependencies }}'
                   composer-options: '--prefer-dist'
@@ -123,13 +123,25 @@ jobs:
                   vendor/bin/simple-phpunit --coverage-clover=tests/App/build/clover.xml
 
             - name: Upload coverage results to Coveralls
-              env:
-                  COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
-              run: |
-                  vendor/bin/php-coveralls --coverage_clover=tests/App/build/clover.xml --json_path=tests/App/build/coveralls.json -v
+              uses: coverallsapp/github-action@v2
+              with:
+                  github-token: ${{ secrets.GITHUB_TOKEN }}
+                  file: tests/App/build/clover.xml
+                  parallel: true
 
             # Enable tmate debugging on failure for 15 minutes
             - name: Setup tmate session
               if: ${{ !env.ACT && failure() }}
               uses: mxschmitt/action-tmate@v3
               timeout-minutes: 15
+
+    finalize:
+        needs: [phpunit]
+        runs-on: ubuntu-20.04
+        steps:
+            - name: Finalize Coveralls Parallel Build
+              uses: coverallsapp/github-action@v2
+              with:
+                  github-token: ${{ secrets.GITHUB_TOKEN }}
+                  parallel-finished: true
+

composer.json

@@ -38,7 +38,6 @@
         "knplabs/knp-paginator-bundle": "^4.0 || ^5.0",
         "friendsofphp/php-cs-fixer": "^3.34",
         "php-coveralls/php-coveralls": "^2.1",
-        "escapestudios/symfony2-coding-standard": "^3.0",
         "jchook/phpunit-assert-throws": "^1.0",
         "dms/phpunit-arraysubset-asserts": "^0.2.1",
         "phpstan/phpstan": "^1.12",
@@ -64,5 +63,20 @@
     },
     "config": {
         "prepend-autoloader": false
+    },
+    "scripts": {
+        "run-tests": [
+            "XDEBUG_MODE=coverage vendor/bin/simple-phpunit --coverage-text"
+        ],
+        "check-code": [
+            "vendor/bin/phpstan",
+            "vendor/bin/rector --dry-run",
+            "vendor/bin/php-cs-fixer check"
+        ],
+        "fix-code": [
+            "vendor/bin/phpstan",
+            "vendor/bin/rector",
+            "vendor/bin/php-cs-fixer fix"
+        ]
     }
 }

phpstan-baseline.neon

@@ -0,0 +1,11 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^PHPDoc tag @throws with type Elasticsearch\\\\Common\\\\Exceptions\\\\ElasticsearchException is not subtype of Throwable$#"
+			count: 1
+			path: src/Manager/IndexManager.php
+
+		-
+			message: "#^Strict comparison using \\!\\=\\= between null and null will always evaluate to false\\.$#"
+			count: 1
+			path: src/Manager/IndexManager.php

phpstan.dist.neon

@@ -1,4 +1,5 @@
 includes:
+    - phpstan-baseline.neon
     - vendor/phpstan/phpstan-symfony/extension.neon
     - vendor/phpstan/phpstan-symfony/rules.neon
 #    - vendor/phpstan/phpstan-phpunit/extension.neon

src/Manager/IndexManager.php

@@ -351,6 +351,7 @@ public function dropIndex(): void
      */
     public function rebuildIndex(bool $deleteOld = false, bool $cancelExistingRebuild = false): void
     {
+        $newIndex = null;
         try {
             if (false === $this->getUseAliases()) {
                 throw new Exception(\sprintf('Index rebuilding is not supported for "%s", unless you use aliases', $this->getBaseIndexName()));
@@ -386,19 +387,19 @@ public function rebuildIndex(bool $deleteOld = false, bool $cancelExistingRebuil
             // Delete the old index
             if ($deleteOld) {
                 $this->getConnection()->getClient()->indices()->delete(['index' => $oldIndex]);
-                $this->getConnection()->getLogger()->notice(\sprintf('Deleted old index %s', $oldIndex));
+                $this->getConnection()->getLogger()?->notice(\sprintf('Deleted old index %s', $oldIndex));
             }
         } catch (\Exception $e) {
             // Do not log BulkRequestException here as they are logged in the connection manager
             // Do not log ElasticsearchException either, as they are logged inside the elasticsearch bundle
             if (!($e instanceof BulkRequestException) && !($e instanceof ElasticsearchException)) {
-                $this->getConnection()->getLogger()->error($e->getMessage());
+                $this->getConnection()->getLogger()?->error($e->getMessage());
             }
 
             // Try to delete the new incomplete index
-            if (isset($newIndex)) {
+            if (null !== $newIndex) {
                 $this->getConnection()->getClient()->indices()->delete(['index' => $newIndex]);
-                $this->getConnection()->getLogger()->notice(\sprintf('Deleted incomplete index "%s"', $newIndex));
+                $this->getConnection()->getLogger()?->notice(\sprintf('Deleted incomplete index "%s"', $newIndex));
             }
 
             // Rethrow exception to be further handled