eee

Container.php

@@ -295,10 +295,10 @@ class Container implements ContainerInterface
         }
 
         $isController = class_exists(\Kiri\Router\Base\Controller::class) && $reflect->isSubclassOf(\Kiri\Router\Base\Controller::class);
-		$needsProxy = !$isController && class_exists(\Kiri\Router\Annotate\DeferRegistry::class) && \Kiri\Router\Annotate\DeferRegistry::hasAny($className);
+		$needsProxy = !$isController && class_exists(\Kiri\Router\Defer\DeferRegistry::class) && \Kiri\Router\Defer\DeferRegistry::hasAny($className);
 
 		if ($needsProxy) {
-			$newInstance = \Kiri\Router\Annotate\DeferProxyGenerator::create($className, $construct);
+			$newInstance = \Kiri\Router\Defer\DeferProxyGenerator::create($className, $construct);
 		} else {
 			$newInstance = $reflect->newInstanceArgs($construct);
 		}
@@ -329,10 +329,10 @@ class Container implements ContainerInterface
             $construct = $this->getMethodParams($handler);
         }
         $isController = class_exists(\Kiri\Router\Base\Controller::class) && $reflect->isSubclassOf(\Kiri\Router\Base\Controller::class);
-		$needsProxy = !$isController && class_exists(\Kiri\Router\Annotate\DeferRegistry::class) && \Kiri\Router\Annotate\DeferRegistry::hasAny($reflect->getName());
+		$needsProxy = !$isController && class_exists(\Kiri\Router\Defer\DeferRegistry::class) && \Kiri\Router\Defer\DeferRegistry::hasAny($reflect->getName());
 
 		if ($needsProxy) {
-			$newInstance = \Kiri\Router\Annotate\DeferProxyGenerator::create($reflect->getName(), $construct);
+			$newInstance = \Kiri\Router\Defer\DeferProxyGenerator::create($reflect->getName(), $construct);
 		} else {
 			$newInstance = $reflect->newInstanceArgs($construct);
 		}

Scanner.php

@@ -79,11 +79,6 @@ class Scanner extends Component
 		}
 
 		$this->syncLegacyState();
-
-		if ($this->config['cache_enabled']) {
-			$this->saveToCache($cacheFile);
-		}
-
 		return $this->changeSet;
 	}
 
@@ -118,6 +113,7 @@ class Scanner extends Component
 		}
 
 		$this->syncLegacyState();
+
 		return $this->changeSet;
 	}
 
@@ -599,8 +595,8 @@ class Scanner extends Component
 			if (method_exists($this->container, 'forgetClass')) {
 				$this->container->forgetClass($class);
 			}
-			if (class_exists(\Kiri\Router\Annotate\DeferRegistry::class)) {
+			if (class_exists(\Kiri\Router\Defer\DeferRegistry::class)) {
-				\Kiri\Router\Annotate\DeferRegistry::removeClass($class);
+				\Kiri\Router\Defer\DeferRegistry::removeClass($class);
 			}
 		}
 	}