Browse Source

Merge pull request #10496 from cakephp/issue-10495

Don't doubly include MessageTrait.
Mark Sch 9 years ago
parent
commit
a571e86993
2 changed files with 1 additions and 2 deletions
  1. 1 1
      composer.json
  2. 0 1
      src/Http/Client/Request.php

+ 1 - 1
composer.json

@@ -24,7 +24,7 @@
         "cakephp/chronos": "~1.0",
         "aura/intl": "^3.0.0",
         "psr/log": "^1.0",
-        "zendframework/zend-diactoros": "~1.0"
+        "zendframework/zend-diactoros": "^1.4"
     },
     "suggest": {
         "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation.",

+ 0 - 1
src/Http/Client/Request.php

@@ -27,7 +27,6 @@ use Zend\Diactoros\Stream;
  */
 class Request extends Message implements RequestInterface
 {
-    use MessageTrait;
     use RequestTrait;
 
     /**