Deprecated stuff

Ecodev · Aug 29, 2023 · 3655c70 · 3655c70
1 parent f7e5fc3
commit 3655c70
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/src/Repository/Traits/LogRepository.php b/src/Repository/Traits/LogRepository.php
@@ -5,7 +5,7 @@
 namespace Ecodev\Felix\Repository\Traits;
 
 use Cake\Chronos\Chronos;
-use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\QueryBuilder;
 use Ecodev\Felix\Repository\LogRepository as LogRepositoryInterface;
@@ -77,7 +77,7 @@ private function failedOften(string $success, string $failed, int $maxFailureCou
             ->andWhere('priority = :priority')
             ->setParameter('priority', Logger::INFO)
             ->andWhere('message IN (:message)')
-            ->setParameter('message', [$success, $failed], Connection::PARAM_STR_ARRAY)
+            ->setParameter('message', [$success, $failed], ArrayParameterType::STRING)
             ->andWhere('creation_date > DATE_SUB(NOW(), INTERVAL 30 MINUTE)')
             ->andWhere('ip = :ip')
             ->setParameter('ip', $ip)
@@ -118,7 +118,7 @@ public function deleteOldLogs(): int
                 LogRepositoryInterface::UPDATE_PASSWORD_FAILED,
                 LogRepositoryInterface::REGISTER,
                 LogRepositoryInterface::REGISTER_CONFIRM,
-            ], Connection::PARAM_STR_ARRAY)
+            ], ArrayParameterType::STRING)
             ->andWhere('log.creation_date < DATE_SUB(NOW(), INTERVAL 2 MONTH)');
 
         $connection->executeStatement('LOCK TABLES `log` WRITE;');

diff --git a/tests/Service/MessageRendererTest.php b/tests/Service/MessageRendererTest.php
@@ -22,24 +22,25 @@ public function testRender(): void
         $mailParams = ['fooMail' => 'barMail'];
 
         $viewRenderer = $this->createMock(RendererInterface::class);
-        $viewRenderer->expects(self::exactly(2))
+        $matcher = self::exactly(2);
+        $viewRenderer->expects($matcher)
             ->method('render')
-            ->withConsecutive(
-                [
-                    self::callback(function (ViewModel $viewModel) use ($user) {
+            ->willReturnCallback(function (ViewModel $viewModel) use ($matcher, $user) {
+                $callback = match ($matcher->getInvocationCount()) {
+                    1 => (function () use ($viewModel, $user) {
                         $variables = [
                             'fooMail' => 'barMail',
                             'email' => '[email protected]',
                             'user' => $user,
                             'serverUrl' => 'https://example.com',
                         ];
 
-                        return $viewModel->getTemplate() === 'my-type'
-                            && $viewModel->getVariables() === $variables;
+                        self::assertSame('my-type', $viewModel->getTemplate());
+                        self::assertSame($variables, $viewModel->getVariables());
+
+                        return 'mocked-rendered-view';
                     }),
-                ],
-                [
-                    self::callback(function (ViewModel $viewModel) use ($user) {
+                    2 => (function () use ($viewModel, $user) {
                         $variables = [
                             'fooLayout' => 'barLayout',
                             'content' => 'mocked-rendered-view',
@@ -49,11 +50,16 @@ public function testRender(): void
                             'hostname' => 'example.com',
                         ];
 
-                        return $viewModel->getTemplate() === 'layout'
-                            && $viewModel->getVariables() === $variables;
+                        self::assertSame('layout', $viewModel->getTemplate());
+                        self::assertSame($variables, $viewModel->getVariables());
+
+                        return 'mocked-rendered-layout';
                     }),
-                ]
-            )->willReturnOnConsecutiveCalls('mocked-rendered-view', 'mocked-rendered-layout');
+                    default => fn () => $this->fail()
+                };
+
+                return $callback();
+            });
 
         $messageRenderer = new MessageRenderer($viewRenderer, 'example.com');