bugfixes

src/Middleware/Cors.php

@@ -7,6 +7,7 @@
 use Neomerx\Cors\Analyzer;
 use Neomerx\Cors\Contracts\AnalysisResultInterface;
 use Neomerx\Cors\Contracts\Strategies\SettingsStrategyInterface;
+use RuntimeException;
 
 /**
  * Middleware to implement Cors.
@@ -55,6 +56,10 @@ public function settings(SettingsStrategyInterface $settings)
      */
     public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next)
     {
+        if (empty($this->settings)) {
+            throw new RuntimeException('No SettingsStrategyInterface instance has been provided');
+        }
+
         $cors = Analyzer::instance($this->settings)->analyze($request);
 
         switch ($cors->getRequestType()) {

src/Middleware/Geolocate.php

@@ -80,8 +80,7 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
         $geocoder = $this->geocoder ?: $this->getGeocoder();
         $ip = ClientIp::getIp($request);
 
-        if ($ip) {
-            $ip = '123.9.34.23';
+        if ($ip !== null) {
             $request = Middleware::setAttribute($request, self::KEY, $geocoder->geocode($ip));
         }
 

src/Middleware/ImageTransformer.php

@@ -4,7 +4,7 @@
 
 use Psr7Middlewares\Utils;
 use Psr7Middlewares\Middleware;
-use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Imagecow\Image;
 use RuntimeException;
@@ -39,13 +39,13 @@ public function sizes(array $sizes)
     /**
      * Execute the middleware.
      *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @param callable          $next
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface      $response
+     * @param callable               $next
      *
      * @return ResponseInterface
      */
-    public function __invoke(RequestInterface $request, ResponseInterface $response, callable $next)
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next)
     {
         if (!Middleware::hasAttribute($request, FormatNegotiator::KEY)) {
             throw new RuntimeException('ResponsiveImage middleware needs FormatNegotiator executed before');

src/Utils/FormTrait.php

@@ -33,7 +33,7 @@ function ($match) use ($input) {
             $count
         );
 
-        if ($count) {
+        if (!empty($count)) {
             $body = Middleware::createStream();
             $body->write($html);
 

src/Utils/Path.php

@@ -29,9 +29,8 @@ public static function fix($path)
     /**
      * Join several pieces into a path.
      * 
-     * @param string $piece1
-     * @param string $piece2
-     *                       ...
+     * @param string
+     *               ...
      * 
      * @return string
      */