Merge remote-tracking branch 'upstream/master' into session

Author: huangzhhui

.gitattributes

@@ -0,0 +1 @@
+/tests export-ignore

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Hyperf
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE.md

@@ -14,7 +14,7 @@
  "zendframework/zend-mime": "^2.7"
  },
  "require-dev": {
- "swoft/swoole-ide-helper": "~1.0.0",
+ "swoft/swoole-ide-helper": "dev-master",
  "phpunit/phpunit": "^5.7"
  },
  "autoload": {
@@ -32,7 +32,7 @@
  },
  "extra": {
  "branch-alias": {
- "dev-master": "1.0-dev"
+ "dev-master": "1.1-dev"
  },
  "hyperf": {
  }

composer.json

@@ -7,7 +7,7 @@
  * @link https://www.hyperf.io
  * @document https://doc.hyperf.io
  * @contact group@hyperf.io
- * @license https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+ * @license https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
 
 namespace Hyperf\HttpMessage\Base;

src/Base/MessageTrait.php

@@ -7,7 +7,7 @@
  * @link https://www.hyperf.io
  * @document https://doc.hyperf.io
  * @contact group@hyperf.io
- * @license https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+ * @license https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
 
 namespace Hyperf\HttpMessage\Base;

src/Base/Request.php

@@ -7,7 +7,7 @@
  * @link https://www.hyperf.io
  * @document https://doc.hyperf.io
  * @contact group@hyperf.io
- * @license https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+ * @license https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
 
 namespace Hyperf\HttpMessage\Base;

src/Base/Response.php

@@ -7,7 +7,7 @@
  * @link https://www.hyperf.io
  * @document https://doc.hyperf.io
  * @contact group@hyperf.io
- * @license https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+ * @license https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
 
 namespace Hyperf\HttpMessage\Cookie;

src/Cookie/Cookie.php

@@ -7,7 +7,7 @@
  * @link https://www.hyperf.io
  * @document https://doc.hyperf.io
  * @contact group@hyperf.io
- * @license https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+ * @license https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
 
 namespace Hyperf\HttpMessage\Cookie;

src/Cookie/CookieJar.php

@@ -7,7 +7,7 @@
  * @link https://www.hyperf.io
  * @document https://doc.hyperf.io
  * @contact group@hyperf.io
- * @license https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+ * @license https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
 
 namespace Hyperf\HttpMessage\Cookie;