Rector improvements

Author: lonnieezell

system/Router/Router.php

@@ -177,7 +177,7 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
      */
     private function getAutoRouter(): AutoRouterInterface
     {
-        if ($this->autoRouter === null) {
+        if (!$this->autoRouter instanceof AutoRouterInterface) {
             $autoRoutesImproved = config(Feature::class)->autoRoutesImproved ?? false;
             if ($autoRoutesImproved) {
                 assert($this->collection instanceof RouteCollection);

tests/system/Router/RoutingOptimizationTest.php

@@ -16,6 +16,7 @@
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Method;
+use CodeIgniter\Router\Controllers\Mycontroller;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Feature;
 use Config\Modules;
@@ -79,7 +80,7 @@ public function testAutoRoutingOnlyMode(): void
         $router = new Router($collection, $this->request);
         $router->handle('mycontroller');
 
-        $this->assertSame('\\CodeIgniter\\Router\\Controllers\\Mycontroller', $router->controllerName());
+        $this->assertSame('\\' . Mycontroller::class, $router->controllerName());
         $this->assertSame('getIndex', $router->methodName());
     }
 
@@ -150,7 +151,7 @@ public function testBothModesEnabled(): void
 
         // Test fallback to auto-routing
         $router->handle('mycontroller');
-        $this->assertSame('\\CodeIgniter\\Router\\Controllers\\Mycontroller', $router->controllerName());
+        $this->assertSame(Mycontroller::class, $router->controllerName());
         $this->assertSame('getIndex', $router->methodName());
     }