改名

2021-04-27 17:04:22 +08:00
parent 19835dba97
commit f4e13f413b
2 changed files with 11 additions and 21 deletions
@@ -42,27 +42,21 @@ class Service extends Component
 	 */
 	public function get($id, $try = true): mixed
 	{
-		if (isset($this->_components[$id])) {
-			return $this->_components[$id];
-		}
-		if (!isset($this->_definition[$id]) && !isset($this->_alias[$id])) {
-			if ($try === false) {
-				return null;
+		if (!isset($this->_components[$id])) {
+			if (!isset($this->_definition[$id])) {
+				throw new ComponentException("Unknown component ID: $id");
 			}
-			throw new ComponentException("Unknown component ID: $id");
-		}
-		if (isset($this->_definition[$id])) {
 			$config = $this->_definition[$id];
 			if (is_object($config)) {
-				return $this->_components[$id] = $config;
+				return $config;
 			}
-			$object = Snowflake::createObject($config);
-		} else {
-			$config = $this->_alias[$id];
-
-			$object = Snowflake::createObject($config);
+			$this->_components[$id] = Snowflake::createObject($config);
 		}
-		return $this->_components[$id] = $object;
+		$object = $this->_components[$id];
+		if (method_exists($object, 'afterInit')) {
+			$object->afterInit();
+		}
+		return $object;
 	}

 	/**