Updated PHP requirements to >= 7.0; (#4)

Updated PHP requirements to >= 7.0;

.travis.yml

@@ -2,7 +2,6 @@ dist: trusty
 language: php
 
 php:
-  - 5.6
   - 7.0
   - 7.1
   - 7.2
@@ -16,11 +15,6 @@ cache:
   directories:
     - $HOME/.composer/cache
 
-matrix:
-  include:
-    - php: 5.6
-      env: 'COMPOSER_FLAGS="--prefer-stable --prefer-lowest"'
-
 before_script:
   - pecl install swoole
   - echo "extension=swoole.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini

README.md

@@ -34,7 +34,7 @@ $bridgeManager->process($swooleRequest, $swooleResponse)->end();
 
 ## Requirements
 
-* PHP-CLI >= 5.6
+* PHP-CLI >= 7.0 (Required by Swoole)
 * Swoole framework (this has been tested with version 1.10.1)
 
 ## Install

composer.json

@@ -17,11 +17,11 @@
         }
     ],
     "require": {
-        "php" : "~5.6|~7.0"
+        "php" : "^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": ">=5.4.3",
         "slim/slim": "^3.9",
+        "phpunit/phpunit": "6.5.6",
         "squizlabs/php_codesniffer": "^3.2"
     },
     "autoload": {

src/Bridge/RequestTransformer.php

@@ -6,17 +6,16 @@
 
 class RequestTransformer implements RequestTransformerInterface
 {
-
     const DEFAULT_SCHEMA = 'http';
 
     /**
      * @param \swoole_http_request $request
      *
      * @return Http\Request
      *
-     * @todo Handle https requests
+     * @todo Handle HTTPS requests
      */
-    public function toSlim(\swoole_http_request $request)
+    public function toSlim(\swoole_http_request $request): Http\Request
     {
 
         $slimRequest = Http\Request::createFromEnvironment(
@@ -43,9 +42,7 @@ public function toSlim(\swoole_http_request $request)
             $slimRequest = $this->handleUploadedFiles($request, $slimRequest);
         }
 
-        $slimRequest = $this->copyBody($request, $slimRequest);
-
-        return $slimRequest;
+        return $this->copyBody($request, $slimRequest);
     }
 
     /**
@@ -54,7 +51,7 @@ public function toSlim(\swoole_http_request $request)
      *
      * @return Http\Request
      */
-    private function copyBody(\swoole_http_request $request, Http\Request $slimRequest)
+    private function copyBody(\swoole_http_request $request, Http\Request $slimRequest): Http\Request
     {
         if (empty($request->rawContent())) {
             return $slimRequest;
@@ -73,7 +70,7 @@ private function copyBody(\swoole_http_request $request, Http\Request $slimReque
      *
      * @return Http\Request
      */
-    private function copyHeaders(\swoole_http_request $request, Http\Request $slimRequest)
+    private function copyHeaders(\swoole_http_request $request, Http\Request $slimRequest): Http\Request
     {
 
         foreach ($request->header as $key => $val) {
@@ -88,7 +85,7 @@ private function copyHeaders(\swoole_http_request $request, Http\Request $slimRe
      *
      * @return boolean
      */
-    private function isMultiPartFormData(\swoole_http_request $request)
+    private function isMultiPartFormData(\swoole_http_request $request): bool
     {
 
         if (!isset($request->header['content-type'])
@@ -104,7 +101,7 @@ private function isMultiPartFormData(\swoole_http_request $request)
      *
      * @return boolean
      */
-    private function isXWwwFormUrlEncoded(\swoole_http_request $request)
+    private function isXWwwFormUrlEncoded(\swoole_http_request $request): bool
     {
 
         if (!isset($request->header['content-type'])
@@ -118,11 +115,11 @@ private function isXWwwFormUrlEncoded(\swoole_http_request $request)
 
     /**
      * @param \swoole_http_request $request
-     * @param \Slim\Http\Request $slimRequest
+     * @param Http\Request $slimRequest
      *
-     * @return \Slim\Http\Request
+     * @return Http\Request
      */
-    private function handleUploadedFiles(\swoole_http_request $request, Http\Request $slimRequest)
+    private function handleUploadedFiles(\swoole_http_request $request, Http\Request $slimRequest): Http\Request
     {
         if (empty($request->files) || !is_array($request->files)) {
             return $slimRequest;
@@ -145,11 +142,11 @@ private function handleUploadedFiles(\swoole_http_request $request, Http\Request
 
     /**
      * @param \swoole_http_request $swooleRequest
-     * @param \Slim\Http\Request $slimRequest
+     * @param Http\Request $slimRequest
      *
-     * @return \Slim\Http\Request
+     * @return Http\Request
      */
-    private function handlePostData(\swoole_http_request $swooleRequest, Http\Request $slimRequest)
+    private function handlePostData(\swoole_http_request $swooleRequest, Http\Request $slimRequest): Http\Request
     {
         if (empty($swooleRequest->post) || !is_array($swooleRequest->post)) {
             return $slimRequest;

src/Bridge/RequestTransformerInterface.php

@@ -6,12 +6,11 @@
 
 interface RequestTransformerInterface
 {
-
     /**
      * @param \swoole_http_request $request
      *
      * @return Http\Request
      *
      */
-    public function toSlim(\swoole_http_request $request);
+    public function toSlim(\swoole_http_request $request): Http\Request;
 }

src/Bridge/ResponseMerger.php

@@ -7,7 +7,6 @@
 
 class ResponseMerger implements ResponseMergerInterface
 {
-
     /**
      * @var App
      */
@@ -27,8 +26,10 @@ public function __construct(App $app)
      *
      * @return \swoole_http_response
      */
-    public function mergeToSwoole(Http\Response $slimResponse, \swoole_http_response $swooleResponse)
-    {
+    public function mergeToSwoole(
+        Http\Response $slimResponse,
+        \swoole_http_response $swooleResponse
+    ): \swoole_http_response {
         $container = $this->app->getContainer();
 
         $settings = $container->get('settings');

src/Bridge/ResponseMergerInterface.php

@@ -6,12 +6,14 @@
 
 interface ResponseMergerInterface
 {
-
     /**
      * @param Http\Response $slimResponse
      * @param \swoole_http_response $swooleResponse
      *
      * @return \swoole_http_response
      */
-    public function mergeToSwoole(Http\Response $slimResponse, \swoole_http_response $swooleResponse);
+    public function mergeToSwoole(
+        Http\Response $slimResponse,
+        \swoole_http_response $swooleResponse
+    ): \swoole_http_response;
 }

src/BridgeManager.php

@@ -8,7 +8,6 @@
 
 class BridgeManager implements BridgeManagerInterface
 {
-
     /**
      * @var App
      */
@@ -45,12 +44,13 @@ public function __construct(
      *
      * @return \swoole_http_response
      */
-    public function process(\swoole_http_request $swooleRequest, \swoole_http_response $swooleResponse)
-    {
+    public function process(
+        \swoole_http_request $swooleRequest,
+        \swoole_http_response $swooleResponse
+    ): \swoole_http_response {
         $slimRequest = $this->requestTransformer->toSlim($swooleRequest);
         $slimResponse = $this->app->process($slimRequest, new Http\Response());
-        $swooleResponse = $this->responseMerger->mergeToSwoole($slimResponse, $swooleResponse);
-
-        return $swooleResponse;
+
+        return $this->responseMerger->mergeToSwoole($slimResponse, $swooleResponse);
     }
 }

src/BridgeManagerInterface.php

@@ -4,12 +4,14 @@
 
 interface BridgeManagerInterface
 {
-
     /**
      * @param \swoole_http_request $swooleRequest
      * @param \swoole_http_response $swooleResponse
      *
      * @return \swoole_http_response
      */
-    public function process(\swoole_http_request $swooleRequest, \swoole_http_response $swooleResponse);
+    public function process(
+        \swoole_http_request $swooleRequest,
+        \swoole_http_response $swooleResponse
+    ): \swoole_http_response;
 }