Merge pull request #3216 from mehdihasanpour/refactor

Refactor
slimphp · Jul 7, 2022 · f640f63 · f640f63
2 parents 484a32a + 1ce17b7
commit f640f63
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/tests/CallableResolverTest.php b/tests/CallableResolverTest.php
@@ -53,9 +53,9 @@ public function testClosure(): void
         $callableRoute = $resolver->resolveRoute($test);
         $callableMiddleware = $resolver->resolveMiddleware($test);
 
-        $this->assertEquals(true, $callable());
-        $this->assertEquals(true, $callableRoute());
-        $this->assertEquals(true, $callableMiddleware());
+        $this->assertTrue($callable());
+        $this->assertTrue($callableRoute());
+        $this->assertTrue($callableMiddleware());
     }
 
     public function testClosureContainer(): void
@@ -90,9 +90,9 @@ public function testFunctionName(): void
         $callableRoute = $resolver->resolveRoute(__NAMESPACE__ . '\testAdvancedCallable');
         $callableMiddleware = $resolver->resolveMiddleware(__NAMESPACE__ . '\testAdvancedCallable');
 
-        $this->assertEquals(true, $callable());
-        $this->assertEquals(true, $callableRoute());
-        $this->assertEquals(true, $callableMiddleware());
+        $this->assertTrue($callable());
+        $this->assertTrue($callableRoute());
+        $this->assertTrue($callableMiddleware());
     }
 
     public function testObjMethodArray(): void

diff --git a/tests/Middleware/OutputBufferingMiddlewareTest.php b/tests/Middleware/OutputBufferingMiddlewareTest.php
@@ -103,7 +103,7 @@ public function testPrepend()
     public function testOutputBufferIsCleanedWhenThrowableIsCaught()
     {
         $responseFactory = $this->getResponseFactory();
-        $mw = (function ($request, $handler) use ($responseFactory) {
+        $mw = (function ($request, $handler) {
             echo "Test";
             $this->assertEquals('Test', ob_get_contents());
             throw new Exception('Oops...');

diff --git a/tests/Routing/DispatcherTest.php b/tests/Routing/DispatcherTest.php
@@ -53,7 +53,7 @@ public function testRouteCacheFileCanBeDispatched()
         });
         $route->setName('foo');
 
-        $cacheFile = dirname(__FILE__) . '/' . uniqid((string) microtime(true));
+        $cacheFile = __DIR__ . '/' . uniqid((string) microtime(true));
         $routeCollector->setCacheFile($cacheFile);
 
         $method = new ReflectionMethod(Dispatcher::class, 'createDispatcher');

diff --git a/tests/Routing/RouteResolverTest.php b/tests/Routing/RouteResolverTest.php
@@ -48,7 +48,7 @@ public function testComputeRoutingResults(string $method, string $uri, string $e
         $dispatcherProphecy = $this->prophesize(DispatcherInterface::class);
         $dispatcherProphecy
             ->dispatch(Argument::type('string'), Argument::type('string'))
-            ->will(function ($args) use ($routingResultsProphecy, $method, $expectedUri) {
+            ->will(function ($args) use ($routingResultsProphecy, $expectedUri) {
                 if ($args[1] !== $expectedUri) {
                     throw new Error(sprintf(
                         "URI transformation failed.\n  Received: '%s'\n  Expected: '%s'",