Merge pull request #83 from l0gicgate/CodeQuality

Code Quality
slimphp · May 5, 2019 · 473a811 · 473a811
2 parents 83ff8a0 + c27e94a
commit 473a811
Show file tree

Hide file tree

Showing 23 changed files with 181 additions and 903 deletions.
diff --git a/LICENSE → LICENSE.md b/LICENSE → LICENSE.md
diff --git a/composer.json b/composer.json
@@ -20,6 +20,11 @@
       "name": "Rob Allen",
       "email": "[email protected]",
       "homepage": "http://akrabat.com"
+    },
+    {
+      "name": "Pierre Berube",
+      "email": "[email protected]",
+      "homepage": "http://www.lgse.com"
     }
   ],
   "require": {
@@ -32,11 +37,11 @@
   },
   "require-dev": {
     "nyholm/psr7": "^1.0",
-    "phpunit/phpunit": "^7.0",
     "phpstan/phpstan": "^0.10.3",
+    "phpunit/phpunit": "^7.0",
+    "php-http/psr7-integration-tests": "dev-master",
     "squizlabs/php_codesniffer": "^3.3.2",
-    "zendframework/zend-diactoros": "^2.0",
-    "php-http/psr7-integration-tests": "dev-master"
+    "zendframework/zend-diactoros": "^2.0"
   },
   "provide": {
     "psr/http-factory": "^1.0"

diff --git a/phpunit.xml → phpunit.xml.dist b/phpunit.xml → phpunit.xml.dist
@@ -2,13 +2,13 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.1/phpunit.xsd"
          colors="true"
-         bootstrap="tests/bootstrap.php">
+         bootstrap="tests/bootstrap.php"
+>
     <testsuites>
-        <testsuite name="slim\http">
+        <testsuite name="Slim-Http Test Suite">
             <directory>tests/</directory>
         </testsuite>
     </testsuites>
-
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">src/</directory>

diff --git a/src/Factory/DecoratedResponseFactory.php b/src/Factory/DecoratedResponseFactory.php
@@ -2,21 +2,18 @@
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @link      https://github.com/slimphp/Slim-Http
- * @copyright Copyright (c) 2011-2018 Josh Lockhart
- * @license   https://github.com/slimphp/Slim-Http/blob/master/LICENSE (MIT License)
+ * @license https://github.com/slimphp/Slim-Http/blob/master/LICENSE.md (MIT License)
  */
+
+declare(strict_types=1);
+
 namespace Slim\Http\Factory;
 
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Slim\Http\Response;
 
-/**
- * Class DecoratedResponseFactory
- * @package Slim\Http\Factory
- */
 class DecoratedResponseFactory implements ResponseFactoryInterface
 {
     /**
@@ -30,7 +27,6 @@ class DecoratedResponseFactory implements ResponseFactoryInterface
     private $streamFactory;
 
     /**
-     * DecoratedResponseFactory constructor.
      * @param ResponseFactoryInterface $responseFactory
      * @param StreamFactoryInterface $streamFactory
      */

diff --git a/src/Factory/DecoratedServerRequestFactory.php b/src/Factory/DecoratedServerRequestFactory.php
@@ -2,20 +2,18 @@
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @link      https://github.com/slimphp/Slim-Http
- * @copyright Copyright (c) 2011-2018 Josh Lockhart
- * @license   https://github.com/slimphp/Slim-Http/blob/master/LICENSE (MIT License)
+ * @license https://github.com/slimphp/Slim-Http/blob/master/LICENSE.md (MIT License)
  */
+
+declare(strict_types=1);
+
 namespace Slim\Http\Factory;
 
 use Psr\Http\Message\ServerRequestFactoryInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\UriInterface;
 use Slim\Http\ServerRequest;
 
-/**
- * Class DecoratedServerRequestFactory
- * @package Slim\Http\Factory
- */
 class DecoratedServerRequestFactory implements ServerRequestFactoryInterface
 {
     /**
@@ -24,7 +22,6 @@ class DecoratedServerRequestFactory implements ServerRequestFactoryInterface
     private $serverRequestFactory;
 
     /**
-     * DecoratedServerRequestFactory constructor.
      * @param ServerRequestFactoryInterface $serverRequestFactory
      */
     public function __construct(ServerRequestFactoryInterface $serverRequestFactory)
@@ -34,7 +31,7 @@ public function __construct(ServerRequestFactoryInterface $serverRequestFactory)
 
     /**
      * @param string $method
-     * @param \Psr\Http\Message\UriInterface|string $uri
+     * @param UriInterface|string $uri
      * @param array $serverParams
      * @return ServerRequest
      */

diff --git a/src/Factory/DecoratedUriFactory.php b/src/Factory/DecoratedUriFactory.php
@@ -2,20 +2,17 @@
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @link      https://github.com/slimphp/Slim-Http
- * @copyright Copyright (c) 2011-2018 Josh Lockhart
- * @license   https://github.com/slimphp/Slim-Http/blob/master/LICENSE (MIT License)
+ * @license https://github.com/slimphp/Slim-Http/blob/master/LICENSE.md (MIT License)
  */
+
+declare(strict_types=1);
+
 namespace Slim\Http\Factory;
 
 use Psr\Http\Message\UriFactoryInterface;
 use Psr\Http\Message\UriInterface;
 use Slim\Http\Uri;
 
-/**
- * Class DecoratedUriFactory
- * @package Slim\Http\Factory
- */
 class DecoratedUriFactory implements UriFactoryInterface
 {
     /**
@@ -24,7 +21,6 @@ class DecoratedUriFactory implements UriFactoryInterface
     private $uriFactory;
 
     /**
-     * DecoratedUriFactory constructor.
      * @param UriFactoryInterface $uriFactory
      */
     public function __construct(UriFactoryInterface $uriFactory)