Remove deprecations.

tests/TestCase/Controller/Component/CommonComponentTest.php

@@ -5,7 +5,6 @@ namespace Tools\Test\TestCase\Controller\Component;
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Http\ServerRequest;
-use Cake\Routing\Router;
 use Shim\TestSuite\TestCase;
 use TestApp\Controller\CommonComponentTestController;
 use Tools\Controller\Component\CommonComponent;
@@ -30,9 +29,7 @@ class CommonComponentTest extends TestCase {
 
 		Configure::write('App.fullBaseUrl', 'http://localhost');
 
-		Router::reload();
-		Router::connect('/:controller', ['action' => 'index']);
-		Router::connect('/:controller/:action/*');
+		$this->loadRoutes();
 
 		$this->request = new ServerRequest(['url' => '/my-controller/foo']);
 		$this->request = $this->request->withParam('controller', 'MyController')

tests/TestCase/Controller/Component/MobileComponentTest.php

@@ -5,7 +5,6 @@ namespace Tools\Test\TestCase\Controller\Component;
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Http\ServerRequest;
-use Cake\Routing\Router;
 use Detection\MobileDetect;
 use Shim\TestSuite\TestCase;
 use TestApp\Controller\MobileComponentTestController;
@@ -51,9 +50,7 @@ class MobileComponentTest extends TestCase {
 			return $detector->isTablet();
 		});
 
-		Router::reload();
-		Router::connect('/:controller', ['action' => 'index']);
-		Router::connect('/:controller/:action/*');
+		$this->loadRoutes();
 
 		$this->event = new Event('Controller.beforeFilter');
 		$this->Controller = new MobileComponentTestController(new ServerRequest());

tests/TestCase/Controller/Component/UrlComponentTest.php

@@ -32,9 +32,7 @@ class UrlComponentTest extends TestCase {
 		$this->event = new Event('Controller.beforeFilter');
 		$this->Controller = new UrlComponentTestController(new ServerRequest());
 
-		Router::reload();
-		Router::connect('/:controller', ['action' => 'index']);
-		Router::connect('/:controller/:action/*');
+		$this->loadRoutes();
 
 		Configure::write('App.fullBaseUrl', 'http://localhost');
 	}

tests/TestCase/View/Helper/FormatHelperTest.php

@@ -3,7 +3,6 @@
 namespace Tools\Test\TestCase\View\Helper;
 
 use Cake\Core\Configure;
-use Cake\Routing\Router;
 use Cake\View\View;
 use Shim\TestSuite\TestCase;
 use Tools\Utility\Text;
@@ -32,9 +31,7 @@ class FormatHelperTest extends TestCase {
 	public function setUp(): void {
 		parent::setUp();
 
-		Router::reload();
-		Router::connect('/:controller', ['action' => 'index']);
-		Router::connect('/:controller/:action/*');
+		$this->loadRoutes();
 
 		Configure::write('App.imageBaseUrl', 'img/');
 

tests/TestCase/View/Helper/HtmlHelperTest.php

@@ -27,9 +27,7 @@ class HtmlHelperTest extends TestCase {
 	public function setUp(): void {
 		parent::setUp();
 
-		Router::reload();
-		Router::connect('/:controller', ['action' => 'index']);
-		Router::connect('/:controller/:action/*');
+		$this->loadRoutes();
 
 		$this->Html = new HtmlHelper(new View(null));
 		$this->Html->getView()->setRequest(new ServerRequest(['webroot' => '']));

tests/TestCase/View/Helper/QrCodeHelperTest.php

@@ -2,7 +2,6 @@
 
 namespace Tools\Test\TestCase\View\Helper;
 
-use Cake\Routing\Router;
 use Cake\View\View;
 use Shim\TestSuite\TestCase;
 use Tools\View\Helper\QrCodeHelper;
@@ -35,9 +34,7 @@ class QrCodeHelperTest extends TestCase {
 	public function setUp(): void {
 		parent::setUp();
 
-		Router::reload();
-		Router::connect('/:controller', ['action' => 'index']);
-		Router::connect('/:controller/:action/*');
+		$this->loadRoutes();
 
 		$this->testEmail = 'foo@bar.local'; // For testing normal behavior
 

tests/TestCase/View/Helper/UrlHelperTest.php

@@ -26,9 +26,7 @@ class UrlHelperTest extends TestCase {
 	public function setUp(): void {
 		parent::setUp();
 
-		Router::reload();
-		Router::connect('/:controller', ['action' => 'index']);
-		Router::connect('/:controller/:action/*');
+		$this->loadRoutes();
 
 		$this->Url = new UrlHelper(new View(null));
 		$this->Url->getView()->setRequest(new ServerRequest(['webroot' => '']));