Merge branch 'master' of https://github.com/top-think/think

Author: liu21st

application/config.php

@@ -15,7 +15,7 @@
     // +----------------------------------------------------------------------
 
     // 应用调试模式
-    'app_debug'              => true,
+    'app_debug'              => false,
     // 应用Trace
     'app_trace'              => false,
     // 应用模式状态

composer.json

@@ -17,7 +17,12 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "topthink/framework": "^5.0"
+        "topthink/framework": "~5.0.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "app\\": "application"
+        }
     },
     "extra": {
         "think-path": "thinkphp"

public/router.php

@@ -13,5 +13,8 @@
 if (is_file($_SERVER["DOCUMENT_ROOT"] . $_SERVER["REQUEST_URI"])) {
     return false;
 } else {
+    if (!isset($_SERVER['PATH_INFO'])) {
+        $_SERVER['PATH_INFO'] = $_SERVER['REQUEST_URI'];
+    }
     require __DIR__ . "/index.php";
 }