remove widgets

hongshu7 · Jan 14, 2018 · a32e0e5 · a32e0e5
1 parent 8bb920b
commit a32e0e5
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 1,635 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,10 @@
 .DS_Store
 .vscode/
 
+composer.lock
 composer.phar
 /vendor/
-tests/data/
+/src/tests/data/
+
+
 
diff --git a/composer.json b/composer.json
@@ -15,7 +15,15 @@
     },
 	"autoload": {
         "psr-4": {
-            "Fasim\\": "src/Fasim"
+            "Fasim\\Cache\\": "src/Fasim/Cache",
+            "Fasim\\Core\\": "src/Fasim/Core",
+            "Fasim\\Db\\": "src/Fasim/Db",
+            "Fasim\\Event\\": "src/Fasim/Event",
+            "Fasim\\Facades\\": "src/Fasim/Facades",
+            "Fasim\\Library\\": "src/Fasim/Library",
+            "Fasim\\Log\\": "src/Fasim/Log",
+            "Fasim\\Session\\": "src/Fasim/Session",
+            "Fasim\\Support\\": "src/Fasim/Cache"
         },
         "files": [
             "src/Fasim/Support/helpers.php"

diff --git a/composer.lock b/composer.lock
diff --git a/src/Fasim/Core/Router.php b/src/Fasim/Core/Router.php
@@ -48,7 +48,10 @@ public function getMatchAction() {
 	public function init() {
 		//获取配置
 
-		$this->modules = Cfg::get('modules');
+		$this->modules = Cfg::get('modules', null);
+		if (!is_array($this->modules)) {
+			$this->modules = [];
+		}
 
 		$wd = $this->getWebsiteDirectory();
 		$requestUri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/';