From f76f1087da1689f981ebfe1ed3f90fd64741164a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 21:02:04 +0000 Subject: [PATCH 1/3] Bump codecov/codecov-action from 4 to 5 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4 to 5. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v4...v5) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce00706..064fce4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,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 From 1a8f49e51fa5793d723028504b104df5b09694f8 Mon Sep 17 00:00:00 2001 From: Liam Bishop Date: Sat, 28 Dec 2024 21:52:48 +0000 Subject: [PATCH 2/3] fix: check driver is Cake Driver before trying to access --- src/Http/SentryClient.php | 7 ++++++- src/Middleware/CakeSentryPerformanceMiddleware.php | 13 ++++++++----- src/Middleware/CakeSentryQueryMiddleware.php | 9 ++++++--- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/Http/SentryClient.php b/src/Http/SentryClient.php index c8bfa78..2da1844 100644 --- 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 */ $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 index e2437d5..7dd188d 100644 --- 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,11 +122,13 @@ protected function addQueryData(): void $logger = null; /** @var \Cake\Database\Driver $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 index f62c36c..3a0a6ec 100644 --- 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; @@ -59,9 +60,11 @@ protected function enableQueryLogging(): void $logger = null; /** @var \Cake\Database\Driver $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); From 023c9b81cca80a8215ffc3a7e2b5f4b33c9f2ba6 Mon Sep 17 00:00:00 2001 From: Kevin Pfeifer Date: Sun, 29 Dec 2024 13:01:45 +0100 Subject: [PATCH 3/3] fix stan --- src/Http/SentryClient.php | 2 +- src/Middleware/CakeSentryPerformanceMiddleware.php | 2 +- src/Middleware/CakeSentryQueryMiddleware.php | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Http/SentryClient.php b/src/Http/SentryClient.php index c8bfa78..7edc84c 100644 --- a/src/Http/SentryClient.php +++ b/src/Http/SentryClient.php @@ -57,7 +57,7 @@ protected function getQueryLoggers(): void if ($connection->configName() === 'debug_kit') { continue; } - /** @var \Cake\Database\Driver $driver */ + /** @var \Cake\Database\Driver|object $driver */ $driver = $connection->getDriver(); $logger = $driver->getLogger(); diff --git a/src/Middleware/CakeSentryPerformanceMiddleware.php b/src/Middleware/CakeSentryPerformanceMiddleware.php index e2437d5..dcde5f1 100644 --- a/src/Middleware/CakeSentryPerformanceMiddleware.php +++ b/src/Middleware/CakeSentryPerformanceMiddleware.php @@ -119,7 +119,7 @@ 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) { diff --git a/src/Middleware/CakeSentryQueryMiddleware.php b/src/Middleware/CakeSentryQueryMiddleware.php index f62c36c..98f25c6 100644 --- a/src/Middleware/CakeSentryQueryMiddleware.php +++ b/src/Middleware/CakeSentryQueryMiddleware.php @@ -57,7 +57,7 @@ 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) { @@ -65,7 +65,9 @@ protected function enableQueryLogging(): void } $logger = new CakeSentryLog($logger, $name, $includeSchemaReflection); - $driver->setLogger($logger); + if (method_exists($driver, 'setLogger')) { + $driver->setLogger($logger); + } } } }