From 5a91c35269199c77079511588db79cfe1fe876d0 Mon Sep 17 00:00:00 2001
From: Ron Rise <ron@siteworxpro.com>
Date: Sun, 16 Nov 2025 11:37:48 -0500
Subject: [PATCH] chore: add log level configuration and enhance logger tests

---
 tests/Http/Middleware/JwtMiddlewareTest.php | 25 ---------------------
 tests/Log/LoggerRpcTest.php                 |  8 +------
 tests/Unit.php                              |  2 ++
 3 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/tests/Http/Middleware/JwtMiddlewareTest.php b/tests/Http/Middleware/JwtMiddlewareTest.php
index e0d840d..353748f 100644
--- a/tests/Http/Middleware/JwtMiddlewareTest.php
+++ b/tests/Http/Middleware/JwtMiddlewareTest.php
@@ -86,11 +86,6 @@ class JwtMiddlewareTest extends Middleware
         $handler->shouldReceive('getMiddlewareStack')
             ->andReturn([$class]);
 
-        $handler
-            ->shouldReceive('handle')
-            ->once()
-            ->andReturn(new Response(200));
-
         $request = new ServerRequest('GET', '/');
         $middleware = new JwtMiddleware();
         $response = $middleware->process($request, $handler);
@@ -108,11 +103,6 @@ class JwtMiddlewareTest extends Middleware
         $handler->shouldReceive('getMiddlewareStack')
             ->andReturn([$class]);
 
-        $handler
-            ->shouldReceive('handle')
-            ->once()
-            ->andReturn(new Response(200));
-
         $request = new ServerRequest('GET', '/');
         $request = $request->withHeader('Authorization', 'Bearer ' . 'invalid_token_string');
         $middleware = new JwtMiddleware();
@@ -135,11 +125,6 @@ class JwtMiddlewareTest extends Middleware
         $handler->shouldReceive('getMiddlewareStack')
             ->andReturn([$class]);
 
-        $handler
-            ->shouldReceive('handle')
-            ->once()
-            ->andReturn(new Response(200));
-
         $request = new ServerRequest('GET', '/');
         $request = $request->withHeader('Authorization', 'Bearer ' . $this->getJwt());
         $middleware = new JwtMiddleware();
@@ -164,11 +149,6 @@ class JwtMiddlewareTest extends Middleware
         $handler->shouldReceive('getMiddlewareStack')
             ->andReturn([$class]);
 
-        $handler
-            ->shouldReceive('handle')
-            ->once()
-            ->andReturn(new Response(200));
-
         $request = new ServerRequest('GET', '/');
         $request = $request->withHeader('Authorization', 'Bearer ' . $this->getJwt());
         $middleware = new JwtMiddleware();
@@ -194,11 +174,6 @@ class JwtMiddlewareTest extends Middleware
         $handler->shouldReceive('getMiddlewareStack')
             ->andReturn([$class]);
 
-        $handler
-            ->shouldReceive('handle')
-            ->once()
-            ->andReturn(new Response(200));
-
         $request = new ServerRequest('GET', '/');
         $request = $request->withHeader('Authorization', 'Bearer ' . $this->getJwt());
         $middleware = new JwtMiddleware();
diff --git a/tests/Log/LoggerRpcTest.php b/tests/Log/LoggerRpcTest.php
index 329c96b..775fb00 100644
--- a/tests/Log/LoggerRpcTest.php
+++ b/tests/Log/LoggerRpcTest.php
@@ -34,7 +34,7 @@ class LoggerRpcTest extends Unit
         $mock = Mockery::mock(LoggerInterface::class);
         $mock->expects('debug')
             ->with('message', ['key' => 'value'])
-            ->once();
+            ->times(1);
 
         \Siteworxpro\App\Services\Facades\Logger::getFacadeContainer()
             ->bind(\RoadRunner\Logger\Logger::class, function () use ($mock) {
@@ -46,8 +46,6 @@ class LoggerRpcTest extends Unit
         $logger->debug('message', ['key' => 'value']);
 
         $mock->shouldHaveReceived('debug');
-
-        Mockery::close();
     }
 
     /**
@@ -76,7 +74,6 @@ class LoggerRpcTest extends Unit
         $logger->notice('message', ['key' => 'value']);
 
         $mock->shouldHaveReceived('info')->times(2);
-        Mockery::close();
     }
 
     /**
@@ -104,7 +101,6 @@ class LoggerRpcTest extends Unit
         $logger->warning('message', ['key' => 'value']);
 
         $mock->shouldHaveReceived('warning');
-        Mockery::close();
     }
 
     /**
@@ -135,7 +131,6 @@ class LoggerRpcTest extends Unit
         $logger->emergency('message', ['key' => 'value']);
 
         $mock->shouldHaveReceived('error')->times(4);
-        Mockery::close();
     }
 
     /**
@@ -162,6 +157,5 @@ class LoggerRpcTest extends Unit
         $logger->log('notaloglevel', 'message', ['key' => 'value']);
 
         $mock->shouldHaveReceived('log')->times(1);
-        Mockery::close();
     }
 }
diff --git a/tests/Unit.php b/tests/Unit.php
index b655657..f84d715 100644
--- a/tests/Unit.php
+++ b/tests/Unit.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Siteworxpro\Tests;
 
 use Illuminate\Container\Container;
+use Mockery;
 use PHPUnit\Framework\TestCase;
 use Siteworx\Config\Config as SWConfig;
 use Siteworxpro\App\Services\Facade;
@@ -29,5 +30,6 @@ abstract class Unit extends TestCase
     {
         Config::clearResolvedInstances();
         Facade::setFacadeContainer(null);
+        Mockery::close();
     }
 }