Updated http-middleware interface to 0.4 and php-cs-fixer to 2.0

Author: oscarotero

.gitignore

@@ -1,2 +1,3 @@
 vendor
 composer.lock
+.php_cs.cache

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 * Updated tests
+* Updated to `http-interop/http-middleware#0.4`
+* Updated `friendsofphp/php-cs-fixer#2.0`
 
 ## 0.2.0 - 2016-11-27
 

composer.json

@@ -19,15 +19,15 @@
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "http-interop/http-middleware": "^0.3",
+        "http-interop/http-middleware": "^0.4",
         "willdurand/geocoder": "^3.3"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.5",
         "zendframework/zend-diactoros": "^1.3",
-        "friendsofphp/php-cs-fixer": "^1.12",
+        "friendsofphp/php-cs-fixer": "^2.0",
         "squizlabs/php_codesniffer": "^2.7",
-        "middlewares/utils": "~0.7"
+        "middlewares/utils": "~0.8"
     },
     "autoload": {
         "psr-4": {
@@ -44,6 +44,6 @@
             "phpunit",
             "phpcs"
         ],
-        "cs-fix": "php-cs-fixer fix . --fixers=-psr0"
+        "cs-fix": "php-cs-fixer fix ."
     }
-}
+}

src/Geolocation.php

@@ -4,13 +4,13 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use Interop\Http\Middleware\ServerMiddlewareInterface;
-use Interop\Http\Middleware\DelegateInterface;
+use Interop\Http\ServerMiddleware\MiddlewareInterface;
+use Interop\Http\ServerMiddleware\DelegateInterface;
 use Geocoder\Geocoder;
 use Geocoder\Provider\FreeGeoIp;
 use Ivory\HttpAdapter\FopenHttpAdapter;
 
-class Geolocation implements ServerMiddlewareInterface
+class Geolocation implements MiddlewareInterface
 {
     /**
      * @var Geocoder