Removed compatibility with PHP5.6, fixed compatibility with PHP7.

Author: georgique

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.6
   - 7.0
   - 7.1
   - 7.2
@@ -21,4 +20,4 @@ install:
 script:
   - |
     php -S localhost:8080 -t demo/web > /dev/null 2>&1 &
-    vendor/bin/codecept run
+    vendor/bin/codecept run

Action.php

@@ -134,9 +134,13 @@ public function runWithParams($params)
 
                 $this->restoreYiiRequest();
             }
-        } catch (JsonRpcException $e) {
+        }
+        catch (JsonRpcException $e) {
             return new ErrorResponse($e);
         }
+        catch (\Throwable $e) {
+            return new InternalErrorException('Error while processing request', [], $e);
+        }
 
         return !$isBatch ? array_shift($batchResponse) : $batchResponse;
     }

Controller.php

@@ -54,13 +54,4 @@ public function behaviors()
         ];
     }
 
-    /**
-     * @throws \yii\base\InvalidConfigException
-     */
-    public function init()
-    {
-        Yii::$app->set('errorHandler', ['class' => ErrorHandler::class]);
-        Yii::$app->getErrorHandler()->register();
-        parent::init();
-    }
 }

ErrorHandler.php

@@ -23,7 +23,7 @@ class JsonRpcError implements \JsonSerializable
      * JsonRpcError constructor.
      * @param \Exception $exception
      */
-    public function __construct(\Exception $exception)
+    public function __construct(\Throwable $exception)
     {
         $this->code = $exception->getCode();
         $this->message = $this->getExceptionMessage($exception);
@@ -59,7 +59,7 @@ public function jsonSerialize()
      * @param \Exception $exception
      * @return string
      */
-    protected function getExceptionMessage(\Exception $exception)
+    protected function getExceptionMessage(\Throwable $exception)
     {
         $message = $exception->getMessage();
         return !empty($message) ?
@@ -71,7 +71,7 @@ protected function getExceptionMessage(\Exception $exception)
      * @param \Exception $exception
      * @return array
      */
-    protected function convertExceptionToArray(\Exception $exception)
+    protected function convertExceptionToArray(\Throwable $exception)
     {
         $errorArray = [];
 

JsonRpcError.php

@@ -192,7 +192,7 @@ public function execute()
             throw new InvalidParamsException('Invalid params', [], $e);
         } catch (InvalidRouteException $e) {
             throw new MethodNotFoundException('Method not found: ' . $route . '.', [], $e);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             throw new InternalErrorException('Internal error', [], $e);
         }
 

JsonRpcRequest.php

@@ -21,10 +21,10 @@
     }
   ],
   "require": {
-    "php": ">=5.6"
+    "php": "~7.0",
+    "yiisoft/yii2": "~2.0.15"
   },
   "require-dev": {
-    "yiisoft/yii2": "~2.0.15",
     "codeception/codeception": "~2.4",
     "flow/jsonpath": "^0.4.0"
   }

composer.json

@@ -73,7 +73,7 @@ public function actionInternalError()
      * @param int $b
      * @return int
      */
-    public function actionSum($a, $b)
+    public function actionSum(int $a, int $b)
     {
         return $a + $b;
     }

demo/controllers/DemoController.php

@@ -1,15 +1,25 @@
 <?php
-namespace tests\Helper;
+
+namespace tests;
 
 use Codeception\PHPUnit\Constraint\JsonContains;
 use SebastianBergmann\Comparator\ComparisonFailure;
 use SebastianBergmann\Comparator\ArrayComparator;
 use SebastianBergmann\Comparator\Factory;
 use Codeception\Util\JsonArray;
 
-class JsonEqualsWrapper extends JsonContains
+class JsonEquals extends JsonContains
 {
-    protected function _matches($other)
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     *
+     * @param mixed $other Value or object to evaluate.
+     *
+     * @return bool
+     */
+    protected function matches($other) : bool
     {
         $jsonResponseArray = new JsonArray($other);
         if (!is_array($jsonResponseArray->toArray())) {

demo/tests/_support/Helper/JsonEqualsWrapper.php renamed to demo/tests/JsonEquals.php

@@ -5,6 +5,7 @@
 // all public methods declared in helper class will be available in $I
 
 use Codeception\Exception\ModuleException;
+use tests\JsonEquals;
 
 class Api extends \Codeception\Module
 {
@@ -21,9 +22,7 @@ public function seeResponseEqualsJson($json = [])
 
         \PHPUnit\Framework\Assert::assertThat(
             $response,
-            version_compare(PHP_VERSION, '7.1', '>=')
-                ? new JsonEqualsTypeHint($json)
-                : new JsonEquals($json)
+            JsonEquals($json)
         );
     }
 }