Merge pull request #31 from LordSimal/3.x

merge 3.x => 3.next
LordSimal · Dec 29, 2024 · e42f30a · e42f30a
2 parents 72e10f3 + 707eb00
commit e42f30a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -54,7 +54,7 @@ jobs:
 
       - name: Code Coverage Report
         if: success() && matrix.php-version == '8.1'
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
 
   cs-stan:
     name: Coding Standard & Static Analysis

diff --git a/src/Http/SentryClient.php b/src/Http/SentryClient.php
@@ -4,6 +4,7 @@
 namespace CakeSentry\Http;
 
 use Cake\Core\Configure;
+use Cake\Database\Driver;
 use Cake\Datasource\ConnectionManager;
 use Cake\Error\PhpError;
 use Cake\Event\Event;
@@ -53,13 +54,17 @@ protected function getQueryLoggers(): void
         $includeSchemaReflection = (bool)Configure::read('CakeSentry.includeSchemaReflection');
 
         foreach ($configs as $name) {
+            $logger = null;
             $connection = ConnectionManager::get($name);
             if ($connection->configName() === 'debug_kit') {
                 continue;
             }
-            /** @var \Cake\Database\Driver $driver */
+            /** @var \Cake\Database\Driver|object $driver */
             $driver = $connection->getDriver();
-            $logger = $driver->getLogger();
+
+            if ($driver instanceof Driver) {
+                $logger = $driver->getLogger();
+            }
 
             if ($logger instanceof CakeSentryLog) {
                 $logger->setIncludeSchema($includeSchemaReflection);

diff --git a/src/Middleware/CakeSentryPerformanceMiddleware.php b/src/Middleware/CakeSentryPerformanceMiddleware.php
@@ -13,6 +13,7 @@
  */
 namespace CakeSentry\Middleware;
 
+use Cake\Database\Driver;
 use Cake\Datasource\ConnectionManager;
 use Cake\Event\EventManager;
 use Cake\Http\Server;
@@ -121,13 +122,15 @@ protected function addQueryData(): void
                 continue;
             }
             $logger = null;
-            /** @var \Cake\Database\Driver $driver */
+            /** @var \Cake\Database\Driver|object $driver */
             $driver = $connection->getDriver();
-            $driverConfig = $driver->config();
-            if ($driverConfig['sentryLog'] ?? false) {
-                $logger = $driver->getLogger();
-                if ($logger instanceof CakeSentryLog) {
-                    $logger->setPerformanceMonitoring(true);
+            if ($driver instanceof Driver) {
+                $driverConfig = $driver->config();
+                if ($driverConfig['sentryLog'] ?? false) {
+                    $logger = $driver->getLogger();
+                    if ($logger instanceof CakeSentryLog) {
+                        $logger->setPerformanceMonitoring(true);
+                    }
                 }
             }
         }

diff --git a/src/Middleware/CakeSentryQueryMiddleware.php b/src/Middleware/CakeSentryQueryMiddleware.php
@@ -14,6 +14,7 @@
 namespace CakeSentry\Middleware;
 
 use Cake\Core\Configure;
+use Cake\Database\Driver;
 use Cake\Datasource\ConnectionManager;
 use CakeSentry\Database\Log\CakeSentryLog;
 use Psr\Http\Message\ResponseInterface;
@@ -57,15 +58,19 @@ protected function enableQueryLogging(): void
                 continue;
             }
             $logger = null;
-            /** @var \Cake\Database\Driver $driver */
+            /** @var \Cake\Database\Driver|object $driver */
             $driver = $connection->getDriver();
-            $driverConfig = $driver->config();
-            if ($driverConfig['sentryLog'] ?? false) {
-                $logger = $driver->getLogger();
+            if ($driver instanceof Driver) {
+                $driverConfig = $driver->config();
+                if ($driverConfig['sentryLog'] ?? false) {
+                    $logger = $driver->getLogger();
+                }
             }
 
             $logger = new CakeSentryLog($logger, $name, $includeSchemaReflection);
-            $driver->setLogger($logger);
+            if (method_exists($driver, 'setLogger')) {
+                $driver->setLogger($logger);
+            }
         }
     }
 }