Merge branch 'add-phpstan-config-and-some-fixes' into 3.x

Closes #2505
slimphp · Nov 25, 2018 · 8caa5c7 · 8caa5c7
2 parents 25da5eb + 6267d67
commit 8caa5c7
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,12 +14,14 @@ php:
 
 before_script:
   - if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then composer require satooshi/php-coveralls:1.* squizlabs/php_codesniffer:2.* -n ; fi
+  - if [[ "$TRAVIS_PHP_VERSION" == '7.1' ]]; then composer require phpstan/phpstan:^0.10.3 -n ; fi
   - if [[ "$TRAVIS_PHP_VERSION" != '5.6' ]]; then composer install -n ; fi
 
 script:
   - if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then vendor/bin/phpunit --coverage-clover clover.xml ; fi
   - if [[ "$TRAVIS_PHP_VERSION" != '5.6' ]]; then vendor/bin/phpunit ; fi
   - if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then vendor/bin/phpcs ; fi
+  - if [[ "$TRAVIS_PHP_VERSION" == '7.1' ]]; then vendor/bin/phpstan analyse Slim ; fi
 
 after_script:
   - if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then php vendor/bin/coveralls --coverage_clover=clover.xml -v ; fi

diff --git a/Slim/App.php b/Slim/App.php
@@ -9,6 +9,7 @@
 namespace Slim;
 
 use Exception;
+use Psr\Http\Message\UriInterface;
 use Slim\Exception\InvalidMethodException;
 use Slim\Http\Response;
 use Throwable;

diff --git a/Slim/Container.php b/Slim/Container.php
@@ -31,16 +31,16 @@
  *  - notAllowedHandler: a callable with the signature: function($request, $response, $allowedHttpMethods)
  *  - callableResolver: an instance of \Slim\Interfaces\CallableResolverInterface
  *
- * @property-read array settings
- * @property-read \Slim\Interfaces\Http\EnvironmentInterface environment
- * @property-read \Psr\Http\Message\ServerRequestInterface request
- * @property-read \Psr\Http\Message\ResponseInterface response
- * @property-read \Slim\Interfaces\RouterInterface router
- * @property-read \Slim\Interfaces\InvocationStrategyInterface foundHandler
- * @property-read callable errorHandler
- * @property-read callable notFoundHandler
- * @property-read callable notAllowedHandler
- * @property-read \Slim\Interfaces\CallableResolverInterface callableResolver
+ * @property-read array $settings
+ * @property-read \Slim\Interfaces\Http\EnvironmentInterface $environment
+ * @property-read \Psr\Http\Message\ServerRequestInterface $request
+ * @property-read \Psr\Http\Message\ResponseInterface $response
+ * @property-read \Slim\Interfaces\RouterInterface $router
+ * @property-read \Slim\Interfaces\InvocationStrategyInterface $foundHandler
+ * @property-read callable $errorHandler
+ * @property-read callable $notFoundHandler
+ * @property-read callable $notAllowedHandler
+ * @property-read \Slim\Interfaces\CallableResolverInterface $callableResolver
  */
 class Container extends PimpleContainer implements ContainerInterface
 {

diff --git a/Slim/Handlers/AbstractError.php b/Slim/Handlers/AbstractError.php
@@ -90,7 +90,7 @@ protected function renderThrowableAsText($throwable)
     /**
      * Wraps the error_log function so that this can be easily tested
      *
-     * @param $message
+     * @param string $message
      */
     protected function logError($message)
     {

diff --git a/Slim/Http/UploadedFile.php b/Slim/Http/UploadedFile.php
@@ -85,7 +85,7 @@ public static function createFromEnvironment(Environment $env)
     {
         if (is_array($env['slim.files']) && $env->has('slim.files')) {
             return $env['slim.files'];
-        } elseif (isset($_FILES)) {
+        } elseif (! empty($_FILES)) {
             return static::parseUploadedFiles($_FILES);
         }
 

diff --git a/Slim/Interfaces/RouterInterface.php b/Slim/Interfaces/RouterInterface.php
@@ -75,7 +75,7 @@ public function popGroup();
     public function getNamedRoute($name);
 
     /**
-     * @param $identifier
+     * @param string $identifier
      *
      * @return \Slim\Interfaces\RouteInterface
      */

diff --git a/Slim/Router.php b/Slim/Router.php
@@ -167,8 +167,9 @@ public function map($methods, $pattern, $handler)
         // According to RFC methods are defined in uppercase (See RFC 7231)
         $methods = array_map("strtoupper", $methods);
 
-        // Add route
+        /** @var \Slim\Route */
         $route = $this->createRoute($methods, $pattern, $handler);
+        // Add route
         $this->routes[$route->getIdentifier()] = $route;
         $this->routeCounter++;
 
@@ -335,7 +336,8 @@ public function popGroup()
     }
 
     /**
-     * @param $identifier
+     *
+     * @param string $identifier
      * @return \Slim\Interfaces\RouteInterface
      */
     public function lookupRoute($identifier)
@@ -371,6 +373,7 @@ public function relativePathFor($name, array $data = [], array $queryParams = []
         $routeDatas = array_reverse($routeDatas);
 
         $segments = [];
+        $segmentName = '';
         foreach ($routeDatas as $routeData) {
             foreach ($routeData as $item) {
                 if (is_string($item)) {

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -0,0 +1,2 @@
+parameters:
+    level: 1