Fix tests ControllerTest.php.

Author: terabytesoftw

tests/framework/console/ControllerTest.php

@@ -8,22 +8,23 @@
 namespace yiiunit\framework\console;
 
 use RuntimeException;
-use yii\console\Exception;
-use yiiunit\framework\console\stubs\DummyService;
 use Yii;
 use yii\base\InlineAction;
 use yii\base\Module;
 use yii\console\Application;
+use yii\console\Exception;
 use yii\console\Request;
+use yii\console\Response;
 use yii\helpers\Console;
+use yiiunit\framework\console\stubs\DummyService;
 use yiiunit\TestCase;
 
 /**
  * @group console
  */
 class ControllerTest extends TestCase
 {
-    private ?\yiiunit\framework\console\FakePhp71Controller $controller = null;
+    private FakePhp71Controller|null $controller = null;
 
     protected function setUp(): void
     {
@@ -92,10 +93,9 @@ public function testBindActionParams(): void
 
         $params = ['avaliable'];
         $message = Yii::t('yii', 'Missing required arguments: {params}', ['params' => implode(', ', ['missing'])]);
-        $this->expectException('yii\console\Exception');
+        $this->expectException(Exception::class);
         $this->expectExceptionMessage($message);
         $result = $controller->runAction('aksi3', $params);
-
     }
 
     public function testNullableInjectedActionParams(): void
@@ -127,7 +127,7 @@ public function testInjectionContainerException(): void
         $params = ['between' => 'test', 'after' => 'another', 'before' => 'test'];
         \Yii::$container->set(DummyService::class, function(): never { throw new \RuntimeException('uh oh'); });
 
-        $this->expectException((new RuntimeException())::class);
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('uh oh');
         $this->controller->bindActionParams($injectionAction, $params);
     }
@@ -144,7 +144,7 @@ public function testUnknownInjection(): void
         $injectionAction = new InlineAction('injection', $this->controller, 'actionInjection');
         $params = ['between' => 'test', 'after' => 'another', 'before' => 'test'];
         \Yii::$container->clear(DummyService::class);
-        $this->expectException((new Exception())::class);
+        $this->expectException(Exception::class);
         $this->expectExceptionMessage('Could not load required service: dummyService');
         $this->controller->bindActionParams($injectionAction, $params);
     }
@@ -198,7 +198,7 @@ public function assertResponseStatus($status, $response): void
         $this->assertSame($status, $response->exitStatus);
     }
 
-    public function runRequest($route, $args = 0)
+    public function runRequest($route, $args = 0): Response
     {
         $request = new Request();
         $request->setParams(func_get_args());

tests/framework/console/FakePhp71Controller.php

@@ -14,9 +14,14 @@
 
 class FakePhp71Controller extends Controller
 {
-    public function actionInjection($before, Request $request, $between, DummyService $dummyService, $after, Post $post = null): void
-    {
-
+    public function actionInjection(
+        $before,
+        Request $request,
+        $between,
+        DummyService $dummyService,
+        Post $post = null,
+        $after
+    ): void {
     }
 
     public function actionNullableInjection(?Request $request, ?Post $post): void