Merge pull request #1136: apply Rector on tests files

.gitignore

@@ -20,6 +20,3 @@ clover.xml
 .env
 builds
 build
-
-/src/Prototype/tests/runtime/cache/
-/src/Scaffolder/tests/App/runtime/cache/

rector.php

@@ -3,12 +3,15 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\DeadCode\Rector\Assign\RemoveDoubleAssignRector;
+use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector;
 use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPublicMethodParameterRector;
+use Rector\DeadCode\Rector\Expression\RemoveDeadStmtRector;
 use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector;
 use Rector\DeadCode\Rector\Property\RemoveUselessVarTagRector;
 use Rector\Php70\Rector\StmtsAwareInterface\IfIssetToCoalescingRector;
@@ -17,6 +20,7 @@
 return RectorConfig::configure()
     ->withPaths([
         __DIR__ . '/src/*/src',
+        __DIR__ . '/src/*/tests',
         __DIR__ . '/tests',
     ])
     ->withParallel()
@@ -30,13 +34,17 @@
             __DIR__ . '/src/Scaffolder/src/Command/FilterCommand.php',
             __DIR__ . '/src/Scaffolder/src/Command/JobHandlerCommand.php',
             __DIR__ . '/src/Scaffolder/src/Command/MiddlewareCommand.php',
+            __DIR__ . '/src/Console/tests/PromptArgumentsTest.php',
         ],
         RemoveUnusedPrivateMethodRector::class => [
             __DIR__ . '/src/Boot/src/Bootloader/ConfigurationBootloader.php',
             __DIR__ . '/src/Broadcasting/src/Bootloader/BroadcastingBootloader.php',
             __DIR__ . '/src/Cache/src/Bootloader/CacheBootloader.php',
             __DIR__ . '/src/Serializer/src/Bootloader/SerializerBootloader.php',
             __DIR__ . '/src/Validation/src/Bootloader/ValidationBootloader.php',
+            __DIR__ . '/src/Translator/tests/IndexerTest.php',
+            __DIR__ . '/src/Tokenizer/tests/ReflectionFileTest.php',
+            __DIR__ . '/src/Core/tests/SingletonsTest.php',
         ],
         RemoveUselessVarTagRector::class => [
             __DIR__ . '/src/Console/src/Traits/HelpersTrait.php',
@@ -54,16 +62,37 @@
         ],
         RemoveUnusedPrivateMethodParameterRector::class => [
             __DIR__ . '/src/Core/src/Internal/Factory.php',
+            __DIR__ . '/src/Core/tests/InjectableTest.php',
+        ],
+        RemoveDoubleAssignRector::class => [
+            __DIR__ . '/src/Core/tests/Scope/FinalizeAttributeTest.php',
+        ],
+        RemoveUnusedVariableAssignRector::class => [
+            __DIR__ . '/src/Core/tests/ExceptionsTest.php',
+        ],
+        RemoveDeadStmtRector::class => [
+            __DIR__ . '/src/Core/tests/ExceptionsTest.php',
         ],
 
-        // to be enabled later after upgrade to 1.2.4 merged
-        // to easier to review
+        // to be enabled later for bc break 4.x
         RemoveUnusedPublicMethodParameterRector::class,
         RemoveEmptyClassMethodRector::class,
         RemoveUnusedPromotedPropertyRector::class,
 
         // start with short open tag
+        __DIR__ . '/src/Views/tests/fixtures/other/var.php',
         __DIR__ . '/tests/app/views/native.php',
+
+        // example code for test
+        '*/Fixtures/*',
+        '*/Stub/*',
+        '*/Stubs/*',
+        '*/tests/Classes/*',
+        '*/tests/Internal/*',
+        __DIR__ . '/src/Console/tests/Configurator',
+
+        // cache
+        '*/runtime/cache/*',
     ])
     ->withPhpSets(php74: true)
     ->withPreparedSets(deadCode: true);

src/AnnotatedRoutes/tests/RouteLocatorListenerTest.php

@@ -54,9 +54,14 @@ private function configureRouter(): void
         $this->container = new Container();
 
         $this->container->bindSingleton(UriFactoryInterface::class, new Psr17Factory());
-        $this->container->bindSingleton(RouterInterface::class, static function (UriHandler $handler, Container $container) {
-            return new Router('/', $handler, $container);
-        });
+        $this->container->bindSingleton(
+            RouterInterface::class,
+            static fn(UriHandler $handler, Container $container) => new Router(
+                '/',
+                $handler,
+                $container,
+            ),
+        );
         $this->container->bindSingleton(GroupRegistry::class, new GroupRegistry($this->container));
 
         $this->listener = new RouteLocatorListener(

src/AuthHttp/tests/Diactoros/ResponseFactory.php

@@ -14,20 +14,12 @@ final class ResponseFactory implements ResponseFactoryInterface
     /** @var HttpConfig */
     protected $config;
 
-    /**
-     * @param HttpConfig $config
-     */
     public function __construct(HttpConfig $config)
     {
         $this->config = $config;
     }
 
-    /**
-     * @param int    $code
-     * @param string $reasonPhrase
-     *
-     * @return ResponseInterface
-     */
+
     public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface
     {
         $response = new Response($code);

src/AuthHttp/tests/Diactoros/UriFactory.php

@@ -10,10 +10,6 @@
 
 final class UriFactory implements UriFactoryInterface
 {
-    /**
-     * @param string $uri
-     * @return UriInterface
-     */
     public function createUri(string $uri = ''): UriInterface
     {
         return new Uri($uri);

src/Boot/tests/ConfigsTest.php

@@ -30,7 +30,7 @@ public function testCustomConfigLoader(): void
             'config' => __DIR__ . '/config',
         ])->run();
 
-        /** @var ConfiguratorInterface $config */
+        /** @var ConfiguratorInterface $configurator */
         $configurator = $core->getContainer()->get(ConfiguratorInterface::class);
 
         $this->assertSame(['test-key' => 'test value'], $configurator->getConfig('yaml'));

src/Boot/tests/EnvironmentTest.php

@@ -84,8 +84,6 @@ public function testSetNullValueWithoutOverwriting(): void
     }
 
     /**
-     * @param array $env
-     * @return EnvironmentInterface
      * @throws \Throwable
      */
     protected function getEnv(array $env, bool $overwite= true): EnvironmentInterface

src/Broadcasting/tests/Middleware/AuthorizationMiddlewareTest.php

@@ -151,9 +151,7 @@ public function testAuthorizationEventsShouldBeDispatched(string $event, bool $a
         $handler = m::mock(RequestHandlerInterface::class);
         $dispatcher = m::mock(EventDispatcherInterface::class);
         $status = new AuthorizationStatus($authStatus, ['topic_name'], ['foo' => 'bar']);
-        $dispatcher->shouldReceive('dispatch')->once()->withArgs(function (Authorized $e) use($event, $status) {
-            return $e->status === $status && $e::class === $event;
-        });
+        $dispatcher->shouldReceive('dispatch')->once()->withArgs(fn(Authorized $e) => $e->status === $status && $e::class === $event);
 
         $middleware = new AuthorizationMiddleware(
             $broadcast = m::mock(BroadcastInterface::class, GuardInterface::class),
@@ -179,11 +177,9 @@ public function testAuthorizationEventsWithoutGuardShouldBeDispatched(): void
         $request = m::mock(ServerRequestInterface::class);
         $handler = m::mock(RequestHandlerInterface::class);
         $dispatcher = m::mock(EventDispatcherInterface::class);
-        $dispatcher->shouldReceive('dispatch')->once()->withArgs(function (Authorized $event) {
-            return $event->status->success === true
-                && $event->status->topics === null
-                && $event->status->response === null;
-        });
+        $dispatcher->shouldReceive('dispatch')->once()->withArgs(fn(Authorized $event) => $event->status->success === true
+            && $event->status->topics === null
+            && $event->status->response === null);
 
         $middleware = new AuthorizationMiddleware(
             m::mock(BroadcastInterface::class),

src/Console/tests/ConfigureTest.php

@@ -125,9 +125,6 @@ public function testNoBreakFailure(): void
         $this->assertEquals(1, $output->getCode());
     }
 
-    /**
-     * @return Console
-     */
     private function bindFailure(): Console
     {
         $core = $this->getCore(

src/Console/tests/InterceptorTest.php

@@ -27,16 +27,19 @@ public function testInterceptorShouldBeResolved(): void
 
         $interceptor->shouldReceive('process')
             ->once()
-            ->withArgs(function (string $controller, string $action, array $parameters, CoreInterface $core) {
-                return $controller === TestCommand::class
-                    && $action === 'perform'
-                    && $parameters['input'] instanceof InputInterface
-                    && $parameters['output'] instanceof OutputInterface
-                    && $parameters['command'] instanceof TestCommand;
-            })
-            ->andReturnUsing(function (string $controller, string $action, array $parameters, CoreInterface $core) {
-                return $core->callAction($controller, $action, $parameters);
-            });
+            ->withArgs(fn(string $controller, string $action, array $parameters, CoreInterface $core) => $controller === TestCommand::class
+                && $action === 'perform'
+                && $parameters['input'] instanceof InputInterface
+                && $parameters['output'] instanceof OutputInterface
+                && $parameters['command'] instanceof TestCommand)
+            ->andReturnUsing(
+                fn(
+                    string $controller,
+                    string $action,
+                    array $parameters,
+                    CoreInterface $core,
+                ) => $core->callAction($controller, $action, $parameters),
+            );
 
         $core = $this->getCore($this->getStaticLocator([
             TestCommand::class

src/Console/tests/UpdateTest.php

@@ -122,9 +122,6 @@ public function testNoBreakFailure(): void
         $this->assertEquals(1, $output->getCode());
     }
 
-    /**
-     * @return Console
-     */
     private function bindFailure(): Console
     {
         $core = $this->getCore(

src/Cookies/tests/CookiesTest.php

@@ -104,9 +104,7 @@ public function testSetNotProtectedCookie(): void
     public function testDecrypt(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function (ServerRequestInterface $r) {
-            return $r->getCookieParams()['name'];
-        });
+        $core->setHandler(fn(ServerRequestInterface $r) => $r->getCookieParams()['name']);
 
         $value = $this->container->get(EncrypterInterface::class)->encrypt('cookie-value');
 
@@ -118,9 +116,7 @@ public function testDecrypt(): void
     public function testDecryptArray(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function (ServerRequestInterface $r) {
-            return $r->getCookieParams()['name'][0];
-        });
+        $core->setHandler(fn(ServerRequestInterface $r) => $r->getCookieParams()['name'][0]);
 
         $value[] = $this->container->get(EncrypterInterface::class)->encrypt('cookie-value');
 
@@ -132,9 +128,7 @@ public function testDecryptArray(): void
     public function testDecryptBroken(): void
     {
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function (ServerRequestInterface $r) {
-            return $r->getCookieParams()['name'];
-        });
+        $core->setHandler(fn(ServerRequestInterface $r) => $r->getCookieParams()['name']);
 
         $value = $this->container->get(EncrypterInterface::class)->encrypt('cookie-value') . 'BROKEN';
 
@@ -195,9 +189,7 @@ public function testGetUnprotected(): void
         ]));
 
         $core = $this->httpCore([CookiesMiddleware::class]);
-        $core->setHandler(function (ServerRequestInterface $r) {
-            return $r->getCookieParams()['name'];
-        });
+        $core->setHandler(fn(ServerRequestInterface $r) => $r->getCookieParams()['name']);
 
         $value = 'cookie-value';
 
@@ -228,9 +220,7 @@ public function testHMAC(): void
         $cookies = $this->fetchCookies($response);
         $this->assertArrayHasKey('name', $cookies);
 
-        $core->setHandler(function ($r) {
-            return $r->getCookieParams()['name'];
-        });
+        $core->setHandler(fn($r) => $r->getCookieParams()['name']);
 
         $response = $this->get($core, '/', [], [], $cookies);
         $this->assertSame(200, $response->getStatusCode());
@@ -286,9 +276,9 @@ private function fetchCookies(ResponseInterface $response): array
         foreach ($response->getHeaders() as $line) {
             $cookie = explode('=', implode('', $line));
             $result[$cookie[0]] = rawurldecode(substr(
-                (string)$cookie[1],
+                $cookie[1],
                 0,
-                (int)strpos((string)$cookie[1], ';')
+                (int)strpos($cookie[1], ';')
             ));
         }
 

src/Cookies/tests/TestResponseFactory.php

@@ -14,20 +14,12 @@ final class TestResponseFactory implements ResponseFactoryInterface
     /** @var HttpConfig */
     protected $config;
 
-    /**
-     * @param HttpConfig $config
-     */
     public function __construct(HttpConfig $config)
     {
         $this->config = $config;
     }
 
-    /**
-     * @param int    $code
-     * @param string $reasonPhrase
-     *
-     * @return ResponseInterface
-     */
+
     public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface
     {
         $response = new Response($code);

src/Core/tests/BindingsTest.php

@@ -20,9 +20,7 @@ public function testBasicBinding(): void
 
         $this->assertFalse($container->has('abc'));
 
-        $container->bind('abc', function () {
-            return 'hello';
-        });
+        $container->bind('abc', fn() => 'hello');
 
         $this->assertTrue($container->has('abc'));
         $this->assertEquals('hello', $container->get('abc'));
@@ -33,9 +31,7 @@ public function testStringBinding(): void
         $container = new Container();
 
         $this->assertFalse($container->has('abc'));
-        $container->bind('abc', function () {
-            return 'hello';
-        });
+        $container->bind('abc', fn() => 'hello');
 
         $container->bind('dce', 'abc');
 

src/Core/tests/InjectableTest.php

@@ -102,9 +102,7 @@ public function testInjector(): void
         $container->bind(ConfigsInterface::class, $configurator);
 
         $configurator->shouldReceive('createInjection')
-            ->with(m::on(static function (ReflectionClass $r) {
-                return $r->getName() === TestConfig::class;
-            }), null)
+            ->with(m::on(static fn(ReflectionClass $r) => $r->getName() === TestConfig::class), null)
             ->andReturn($expected);
 
         $this->assertSame($expected, $container->get(TestConfig::class));
@@ -119,9 +117,7 @@ public function testInjectorWithContext(): void
         $container->bind(ConfigsInterface::class, $configurator);
 
         $configurator->shouldReceive('createInjection')
-            ->with(m::on(static function (ReflectionClass $r) {
-                return $r->getName() === TestConfig::class;
-            }), 'context')
+            ->with(m::on(static fn(ReflectionClass $r) => $r->getName() === TestConfig::class), 'context')
             ->andReturn($expected);
 
         $this->assertSame($expected, $container->get(TestConfig::class, 'context'));
@@ -236,9 +232,6 @@ public function createInjection(\ReflectionClass $class, mixed $context = null):
         $this->assertInstanceOf(\ReflectionParameter::class, $result->context);
     }
 
-    /**
-     * @param TestConfig $contextArgument
-     */
     private function methodInjection(TestConfig $contextArgument): void
     {
     }

src/Core/tests/InvokerTest.php

@@ -95,9 +95,7 @@ public function testCallValidClosure(): void
         $this->container->bindSingleton(Bucket::class, $bucket = new Bucket('foo'));
 
         $result = $this->container->invoke(
-            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz') {
-                return \compact('bucket', 'class', 'name', 'path');
-            },
+            static fn(Bucket $bucket, SampleClass $class, string $name, string $path = 'baz') => \compact('bucket', 'class', 'name', 'path'),
             ['name' => 'bar']
         );
 
@@ -113,9 +111,7 @@ public function testCallValidClosureWithNotResolvableDependencies(): void
         $this->expectExceptionMessage('Unable to resolve required argument `name` when resolving');
 
         $this->container->invoke(
-            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz') {
-                return \compact('bucket', 'class', 'name', 'path');
-            },
+            static fn(Bucket $bucket, SampleClass $class, string $name, string $path = 'baz') => \compact('bucket', 'class', 'name', 'path'),
             ['name' => 'bar']
         );
     }