Parcourir la source

Update: 更新 composer php 版本号

朱金辉 il y a 1 an
Parent
commit
6a37ce6ba5
5 fichiers modifiés avec 26 ajouts et 7 suppressions
  1. 1 1
      composer.json
  2. 1 1
      src/Application.php
  3. 0 2
      src/Base/Dispatcher.php
  4. 21 0
      src/Base/Request.php
  5. 3 3
      src/Qii.php

+ 1 - 1
composer.json

@@ -19,7 +19,7 @@
     },
     "minimum-stability": "dev",
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "ext-gd" : ">=2.1.0"
     }
 }

+ 1 - 1
src/Application.php

@@ -309,7 +309,7 @@ class Application
     /**
      * 全局 Middleware
      * @param array $middleware
-     * @return void
+     * @return $this
      */
     public function setGlobalMiddleware($middleware) {
         if (!is_array($middleware)) {

+ 0 - 2
src/Base/Dispatcher.php

@@ -121,9 +121,7 @@ class Dispatcher
             $param = $property->getName();
             $this->request->setParam($param, $$param);
         }
-        //$this->controllerCls = $controllerCls;
         $this->controllerCls->setRequest($this->request);
-        //$this->controllerCls->controller = $controllerCls;
         $this->controllerCls->controllerId = $controller;
         $this->controllerCls->actionId = $action;
         $realAction = $action . Register::get(Consts::APP_DEFAULT_ACTION_SUFFIX);

+ 21 - 0
src/Base/Request.php

@@ -37,6 +37,8 @@ abstract class Request
      */
     public $url;
 
+    private static $context = array();
+
     /**
      * 初始化参数,获取链接中对应的参数并存放到$this->params中
      *
@@ -77,6 +79,25 @@ abstract class Request
     }
 
     /**
+     * request context
+     * @param string $key
+     * @param string $val
+     * @return void
+     */
+    public function setContext($key, $val) {
+        self::$context[$key] = $val;
+    }
+
+    /**
+     * 获取context
+     * @param string $key
+     * @return mixed|null
+     */
+    public function getContext($key) {
+        return isset(self::$context[$key]) ? self::$context[$key]: null;
+    }
+
+    /**
      * 获取POST数据
      */
     public function post($name = null, $default = null)

+ 3 - 3
src/Qii.php

@@ -83,7 +83,7 @@ class Qii extends Application
      */
     public static function setPrivate($name, $value)
     {
-        Psr4::getInstance()->loadClass('\Qii\Config\Arrays')->setPrivate($name, $value);
+        return Psr4::getInstance()->loadClass('\Qii\Config\Arrays')->setPrivate($name, $value);
     }
 
     /**
@@ -208,8 +208,8 @@ if (!function_exists('catch_fatal_error')) {
 $namespace = _include(QII_DIR . DS . 'Config' . DS . 'Namespace.php');
 Psr4::getInstance()
     ->register()
-    ->setUseNamespaces($namespace['setUseNamespace'] ?? [])
-    ->addNamespaces($namespace['addNamespace'] ?? []);
+    ->setUseNamespaces(isset($namespace['setUseNamespace']) ? $namespace['setUseNamespace']: [])
+    ->addNamespaces(isset($namespace['addNamespace']) ? $namespace['addNamespace'] : []);
 
 //加载默认语言包
 Factory::getInstance('\Qii\Language\Loader')->load('error', QII_DIR . DS . 'Language');