Merge pull request #38 from MacPaw/develop

New Release

Author: Yozhef

.github/workflows/ci.yaml

@@ -26,8 +26,10 @@ jobs:
                 include:
                     - php: '8.0'
                       symfony-versions: '^6.0'
+                      coverage: 'none'
                     - php: '8.1'
                       symfony-versions: '^6.0'
+                      coverage: 'none'
                     - description: 'Log Code Coverage'
                       php: '8.1'
                       coverage: 'xdebug'

.github/workflows/static-analysis.yaml

@@ -37,3 +37,19 @@ jobs:
 
             - name: Run script
               run: vendor/bin/phpstan analyse
+
+    composer-validate:
+        name: Composer validate
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+
+            - name: Install dependencies
+              run: composer install --no-progress --no-interaction --prefer-dist
+
+            - name: Run script
+              run: composer composer-validate

composer.json

@@ -52,6 +52,9 @@
         }
     },
     "scripts": {
+        "composer-validate": [
+            "composer validate"
+        ],
         "cs": [
             "vendor/bin/phpcs"
         ],

src/Check/DoctrineCheck.php

@@ -42,7 +42,8 @@ public function check(): array
         }
 
         try {
-            $entityManager->getConnection()->ping();
+            $con = $entityManager->getConnection();
+            $con->executeQuery($con->getDatabasePlatform()->getDummySelectSQL())->free();
         } catch (Throwable $e) {
             return array_merge($result, [self::CHECK_RESULT_KEY => false]);
         }

tests/Integration/Mock/AbstractPlatformMock.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SymfonyHealthCheckBundle\Tests\Integration\Mock;
+
+class AbstractPlatformMock
+{
+    public function getDummySelectSQL(): string
+    {
+        $expression = func_num_args() > 0 ? func_get_arg(0) : '1';
+
+        return sprintf('SELECT %s', $expression);
+    }
+}

tests/Integration/Mock/ConnectionMock.php

@@ -6,8 +6,13 @@
 
 class ConnectionMock
 {
-    public function ping(): bool
+    public function getDatabasePlatform(): AbstractPlatformMock
     {
-        return true;
+        return new AbstractPlatformMock();
+    }
+
+    public function executeQuery(): ExecuteQueryMock
+    {
+        return new ExecuteQueryMock();
     }
 }

tests/Integration/Mock/ExecuteQueryMock.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SymfonyHealthCheckBundle\Tests\Integration\Mock;
+
+class ExecuteQueryMock
+{
+    public function free(): void
+    {
+    }
+}

tests/Integration/Unit/Check/DoctrineCheckTest.php

@@ -104,7 +104,7 @@ public function testDoctrineFailPing(): void
             ->willReturn($connectionMock);
 
         $connectionMock
-            ->method('ping')
+            ->method('getDatabasePlatform')
             ->with()
             ->will(self::throwException(new Exception()));