UICore: Suggest that ilCtrlInteface will never return in "redirec…

components/ILIAS/LegalDocuments/tests/ConsumerToolbox/RoutingTest.php

@@ -97,6 +97,8 @@ public function testRedirectToOriginalTarget(): void
         $ctrl = $this->mock(ilCtrl::class);
         $ctrl->expects(self::once())->method('redirectToURL')->with('some url');
 
+        $this->expectException(\PHPUnit\Framework\MockObject\NeverReturningMethodException::class);
+
         (new Routing(
             $ctrl,
             $session,

components/ILIAS/LegalDocuments/tests/Provide/ProvideWithdrawalTest.php

@@ -59,8 +59,6 @@ function (array $params): string {
 
     public function testFinishAndLogout(): void
     {
-        $called = false;
-
         $auth_session = $this->mock(ilAuthSession::class);
         $auth_session->expects(self::once())->method('logout');
 
@@ -72,14 +70,13 @@ public function testFinishAndLogout(): void
             $ctrl,
             $auth_session,
             $this->fail(...),
-            function (int $x) use (&$called) {
+            function (int $x) {
                 $this->assertSame(ilSession::SESSION_CLOSE_USER, $x);
-                $called = true;
             }
         );
 
-        $instance->finishAndLogout(['bar' => 'baz']);
+        $this->expectException(\PHPUnit\Framework\MockObject\NeverReturningMethodException::class);
 
-        $this->assertTrue($called);
+        $instance->finishAndLogout(['bar' => 'baz']);
     }
 }

components/ILIAS/LegalDocuments/tests/StartUpStepTest.php

@@ -65,6 +65,8 @@ public function testExecute(): void
             $this->mockTree(Intercept::class, ['intercept' => true, 'id' => 'baz', 'target' => ['guiName' => 'foo', 'guiPath' => ['foo'], 'command' => 'bar']]),
         ]]));
 
+        $this->expectException(\PHPUnit\Framework\MockObject\NeverReturningMethodException::class);
+
         $instance->execute();
     }
 

components/ILIAS/Mail/tests/gui/ilMailOptionsGUITest.php

@@ -122,6 +122,9 @@ public function testMailOptionsAreNotAccessibleIfGlobalAccessIsDeniedAndUserWill
 
         $gui = $this->getMailOptionsGUI($http, $ctrl, $options);
         $gui->setForm($form);
+
+        $this->expectException(\PHPUnit\Framework\MockObject\NeverReturningMethodException::class);
+
         $gui->executeCommand();
     }
 

components/ILIAS/Test/tests/ilObjTestGUITest.php

@@ -85,6 +85,8 @@ public function testRunObject(): void
             ->method('redirectByClass')
             ->with([ilRepositoryGUI::class, ilObjTestGUI::class, ilInfoScreenGUI::class]);
 
+        $this->expectException(\PHPUnit\Framework\MockObject\NeverReturningMethodException::class);
+
         $testObj->runObject();
     }
 
@@ -96,8 +98,10 @@ public function testCancelCreateQuestionObject(): void
         $ctrl_mock
             ->expects($this->once())
             ->method('redirect')
-            ->with($testObj, ilObjTestGUI::SHOW_QUESTIONS_CMD)
-        ;
+            ->with($testObj, ilObjTestGUI::SHOW_QUESTIONS_CMD);
+
+        $this->expectException(\PHPUnit\Framework\MockObject\NeverReturningMethodException::class);
+
         $testObj->cancelCreateQuestionObject();
     }
 }

components/ILIAS/TestQuestionPool/tests/ilAssQuestionFeedbackPageObjectCommandForwarderTest.php

@@ -40,6 +40,8 @@ protected function setUp(): void
         $tabs = $this->createMock(ilTabsGUI::class);
         $lng = $this->createMock(ilLanguage::class);
 
+        $this->expectException(\PHPUnit\Framework\MockObject\NeverReturningMethodException::class);
+
         $this->object = new ilAssQuestionFeedbackPageObjectCommandForwarder($questionOBJ, $ctrl, $tabs, $lng);
     }
 

components/ILIAS/UICore/classes/class.ilCtrl.php

@@ -395,7 +395,7 @@ public function redirect(
         ?string $a_cmd = null,
         ?string $a_anchor = null,
         bool $is_async = false
-    ): void {
+    ): never {
         $this->redirectByClass(
             $this->getClassByObject($a_gui_obj),
             $a_cmd,
@@ -412,7 +412,7 @@ public function redirectByClass(
         ?string $a_cmd = null,
         ?string $a_anchor = null,
         bool $is_async = false
-    ): void {
+    ): never {
         $this->redirectToURL(
             $this->getLinkTargetByClass(
                 $a_class,
@@ -426,7 +426,7 @@ public function redirectByClass(
     /**
      * @inheritDoc
      */
-    public function redirectToURL(string $target_url): void
+    public function redirectToURL(string $target_url): never
     {
         // prepend the ILIAS HTTP path if it wasn't already.
         if (defined("ILIAS_HTTP_PATH") &&

components/ILIAS/UICore/interfaces/interface.ilCtrlInterface.php

@@ -305,7 +305,7 @@ public function redirect(
         ?string $a_cmd = null,
         ?string $a_anchor = null,
         bool $is_async = false
-    ): void;
+    ): never;
 
     /**
      * Redirects to the provided GUI class.
@@ -321,14 +321,14 @@ public function redirectByClass(
         ?string $a_cmd = null,
         ?string $a_anchor = null,
         bool $is_async = false
-    ): void;
+    ): never;
 
     /**
      * Redirects to the given target URL.
      *
      * @param string $target_url
      */
-    public function redirectToURL(string $target_url): void;
+    public function redirectToURL(string $target_url): never;
 
     /**
      * Sets the current object (id and type) of ilCtrl's context.