Don't doubly include MessageTrait.

RequestTrait already includes MessageTrait. Also pin to newer diactoros as there are problems with older versions. Refs #10495
cakephp · Apr 6, 2017 · 6a073af · 6a073af
1 parent 4c716e8
commit 6a073af
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/composer.json b/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.",

diff --git a/src/Http/Client/Request.php b/src/Http/Client/Request.php
@@ -27,7 +27,6 @@
  */
 class Request extends Message implements RequestInterface
 {
-    use MessageTrait;
     use RequestTrait;
 
     /**