Refactored instanceof in Module into method in Application

framework/yii/base/Application.php

@@ -172,6 +172,20 @@ abstract class Application extends Module
 	}
 
 	/**
+	 * Initializes the application.
+	 * This method is called after the application is created and initialized with property values
+	 * given in configuration.
+	 */
+	public function init()
+	{
+		$this->preloadComponents();
+		if ($this->controllerNamespace === null) {
+			$this->controllerNamespace = 'app\\controllers';
+		}
+	}
+
+
+	/**
 	 * Loads components that are declared in [[preload]].
 	 * @throws InvalidConfigException if a component or module to be preloaded is unknown
 	 */

framework/yii/base/Module.php

@@ -167,20 +167,16 @@ abstract class Module extends Component
 	/**
 	 * Initializes the module.
 	 * This method is called after the module is created and initialized with property values
-	 * given in configuration. The default implement will create a path alias using the module [[id]]
+	 * given in configuration. The default implementation will create a path alias using the module [[id]]
 	 * and then call [[preloadComponents()]] to load components that are declared in [[preload]].
 	 */
 	public function init()
 	{
 		$this->preloadComponents();
 		if ($this->controllerNamespace === null) {
-			if ($this instanceof Application) {
+			$class = get_class($this);
-				$this->controllerNamespace = 'app\\controllers';
+			if (($pos = strrpos($class, '\\')) !== false) {
-			} else {
+				$this->controllerNamespace = substr($class, 0, $pos) . '\\controllers';
-				$class = get_class($this);
-				if (($pos = strrpos($class, '\\')) !== false) {
-					$this->controllerNamespace = substr($class, 0, $pos) . '\\controllers';
-				}
 			}
 		}
 	}