Switch to http-server-middleware

Author: oscarotero

.travis.yml

@@ -2,7 +2,6 @@ language: php
 sudo: false
 
 php:
-  - 5.6
   - 7.0
   - 7.1
 

CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## UNRELEASED
+
+### Removed
+
+* Removed support for PHP 5.x.
+
+### Changed
+
+* Replaced `http-interop/http-middleware` with  `http-interop/http-server-middleware`.
+
 ## [0.4.0] - 2017-09-21
 
 ### Changed

README.md

@@ -11,7 +11,7 @@ Middleware to normalize the trailing slash of the uri path. By default removes t
 
 ## Requirements
 
-* PHP >= 5.6
+* PHP >= 7.0
 * A [PSR-7](https://packagist.org/providers/psr/http-message-implementation) http mesage implementation ([Diactoros](https://github.com/zendframework/zend-diactoros), [Guzzle](https://github.com/guzzle/psr7), [Slim](https://github.com/slimphp/Slim), etc...)
 * A [PSR-15](https://github.com/http-interop/http-middleware) middleware dispatcher ([Middleman](https://github.com/mindplay-dk/middleman), etc...)
 

composer.json

@@ -17,12 +17,12 @@
         "issues": "https://github.com/middlewares/trailing-slash/issues"
     },
     "require": {
-        "php": "^5.6 || ^7.0",
-        "http-interop/http-middleware": "^0.5",
-        "middlewares/utils": "~0.12"
+        "php": "^7.0",
+        "middlewares/utils": "~0.13",
+        "http-interop/http-server-middleware": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.5 || ^6.0",
+        "phpunit/phpunit": "^6.0",
         "zendframework/zend-diactoros": "^1.3",
         "friendsofphp/php-cs-fixer": "^2.0",
         "squizlabs/php_codesniffer": "^3.0"

src/TrailingSlash.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types = 1);
 
 namespace Middlewares;
 
@@ -21,37 +22,26 @@ class TrailingSlash implements MiddlewareInterface
 
     /**
      * Configure whether add or remove the slash.
-     *
-     * @param bool $trailingSlash
      */
-    public function __construct($trailingSlash = false)
+    public function __construct(bool $trailingSlash = false)
     {
-        $this->trailingSlash = (bool) $trailingSlash;
+        $this->trailingSlash = $trailingSlash;
     }
 
     /**
      * Whether returns a 301 response to the new path.
-     *
-     * @param bool $redirect
-     *
-     * @return self
      */
-    public function redirect($redirect = true)
+    public function redirect(bool $redirect = true): self
     {
-        $this->redirect = (bool) $redirect;
+        $this->redirect = $redirect;
 
         return $this;
     }
 
     /**
      * Process a request and return a response.
-     *
-     * @param ServerRequestInterface  $request
-     * @param RequestHandlerInterface $handler
-     *
-     * @return ResponseInterface
      */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler)
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $uri = $request->getUri();
         $path = $this->normalize($uri->getPath());
@@ -66,12 +56,8 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
     /**
      * Normalize the trailing slash.
-     *
-     * @param string $path
-     *
-     * @return string
      */
-    private function normalize($path)
+    private function normalize(string $path): string
     {
         if ($path === '') {
             return '/';