Refactoring and updating composer

Author: niden

composer.json

@@ -23,6 +23,7 @@
         "ext-json": "*",
         "ext-redis": "*",
         "ext-pdo": "*",
+        "ext-psr": "^0.7|1.0",
         "ext-xml": "^7.2",
         "pds/skeleton": "@dev",
         "psr/container": "^1.0",

composer.lock

@@ -13,8 +13,6 @@
 
 namespace Phalcon\Http\Message\Exception;
 
-use Throwable;
-
-class InvalidArgumentException extends \InvalidArgumentException implements Throwable
+class InvalidArgumentException extends \InvalidArgumentException
 {
 }

src/Http/Message/Exception/InvalidArgumentException.php

@@ -9,6 +9,7 @@
  * file that was distributed with this source code.
  *
  * Implementation of this file has been influenced by Zend Diactoros
+ *
  * @link    https://github.com/zendframework/zend-diactoros
  * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md
  */
@@ -18,15 +19,22 @@
 namespace Phalcon\Http\Message;
 
 use Phalcon\Http\Message\Stream\Input;
+use Phalcon\Http\Message\Traits\CommonTrait;
+use Phalcon\Http\Message\Traits\MessageTrait;
+use Phalcon\Http\Message\Traits\RequestTrait;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
 
 /**
  * PSR-7 Request
  */
-final class Request extends AbstractRequest implements RequestInterface
+final class Request implements RequestInterface
 {
+    use CommonTrait;
+    use MessageTrait;
+    use RequestTrait;
+
     /**
      * Request constructor.
      *

src/Http/Message/Request.php

@@ -9,6 +9,7 @@
  * file that was distributed with this source code.
  *
  * Implementation of this file has been influenced by Zend Diactoros
+ *
  * @link    https://github.com/zendframework/zend-diactoros
  * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md
  */
@@ -17,8 +18,8 @@
 
 namespace Phalcon\Http\Message;
 
-use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\RequestFactoryInterface;
+use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\UriInterface;
 
 /**

src/Http/Message/RequestFactory.php

@@ -9,6 +9,7 @@
  * file that was distributed with this source code.
  *
  * Implementation of this file has been influenced by Zend Diactoros
+ *
  * @link    https://github.com/zendframework/zend-diactoros
  * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md
  */
@@ -19,6 +20,9 @@
 
 use Phalcon\Helper\Number;
 use Phalcon\Http\Message\Exception\InvalidArgumentException;
+use Phalcon\Http\Message\Traits\CommonTrait;
+use Phalcon\Http\Message\Traits\MessageTrait;
+use Phalcon\Http\Message\Traits\ResponseTrait;
 use Psr\Http\Message\ResponseInterface;
 
 use function is_int;
@@ -30,8 +34,12 @@
  * @property string $reasonPhrase
  * @property int    $statusCode
  */
-final class Response extends AbstractMessage implements ResponseInterface
+final class Response implements ResponseInterface
 {
+    use CommonTrait;
+    use MessageTrait;
+    use ResponseTrait;
+
     /**
      * Gets the response reason phrase associated with the status code.
      *
@@ -47,7 +55,7 @@ final class Response extends AbstractMessage implements ResponseInterface
      *
      * @var string
      */
-    protected $reasonPhrase = "";
+    private $reasonPhrase = '';
 
     /**
      * Gets the response status code.
@@ -57,7 +65,7 @@ final class Response extends AbstractMessage implements ResponseInterface
      *
      * @var int
      */
-    protected $statusCode = 200;
+    private $statusCode = 200;
 
     /**
      * Response constructor.
@@ -78,6 +86,8 @@ public function __construct(
     }
 
     /**
+     * Returns the reason phrase
+     *
      * @return string
      */
     public function getReasonPhrase(): string
@@ -86,6 +96,8 @@ public function getReasonPhrase(): string
     }
 
     /**
+     * Returns the status code
+     *
      * @return int
      */
     public function getStatusCode()

src/Http/Message/Response.php

@@ -9,6 +9,7 @@
  * file that was distributed with this source code.
  *
  * Implementation of this file has been influenced by Zend Diactoros
+ *
  * @link    https://github.com/zendframework/zend-diactoros
  * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md
  */
@@ -17,8 +18,8 @@
 
 namespace Phalcon\Http\Message;
 
-use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * PSR-17 ResponseFactory
@@ -29,10 +30,11 @@ final class ResponseFactory implements ResponseFactoryInterface
      * Create a new response.
      *
      * @param int    $code         The HTTP status code. Defaults to 200.
-     * @param string $reasonPhrase The reason phrase to associate with the status
-     *                             code in the generated response. If none is
-     *                             provided, implementations MAY use the defaults
-     *                             as suggested in the HTTP specification.
+     * @param string $reasonPhrase The reason phrase to associate with the
+     *                             status code in the generated response. If
+     *                             none is provided, implementations MAY use
+     *                             the defaults as suggested in the HTTP
+     *                             specification.
      *
      * @return ResponseInterface
      */