added compatibility with php 7.0

Author: igor-chepurnoi

.travis.yml

@@ -1,6 +1,7 @@
 language: php
 
 php:
+  - 7.0
   - 7.1
 
 # faster builds on new travis setup not using sudo
@@ -18,4 +19,4 @@ install:
 
 script:
   - vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --dry-run --diff
-  - phpunit --verbose
+  - vendor/bin/phpunit --verbose

base/ItemController.php

@@ -227,10 +227,10 @@ protected function findModel(string $id): AuthItemModel
         $auth = Yii::$app->getAuthManager();
         $item = $this->type === Item::TYPE_ROLE ? $auth->getRole($id) : $auth->getPermission($id);
 
-        if ($item) {
-            return new AuthItemModel($item);
-        } else {
+        if (empty($item)) {
             throw new NotFoundHttpException(Yii::t('yii2mod.rbac', 'The requested page does not exist.'));
         }
+
+        return new AuthItemModel($item);
     }
 }

commands/MigrateController.php

@@ -49,7 +49,7 @@ class MigrateController extends BaseMigrateController
     /**
      * @inheritdoc
      */
-    public function init(): void
+    public function init()
     {
         $this->db = Instance::ensure($this->db, Connection::class);
 

composer.json

@@ -17,18 +17,19 @@
             "email": "[email protected]"
         },
         {
-            "name": "Igor Chepurnoy",
-            "email": "igorzfort@gmail.com"
+            "name": "Igor Chepurnoi",
+            "email": "chepurnoi.igor@gmail.com"
         }
     ],
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.0.0",
         "yiisoft/yii2": "~2.0.10",
         "2amigos/yii2-arrayquery-component": "*",
         "yiisoft/yii2-jui": "*"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "~2.0"
+        "friendsofphp/php-cs-fixer": "~2.0",
+        "phpunit/phpunit": "~6.0"
     },
     "autoload": {
         "psr-4": {

controllers/AssignmentController.php

@@ -46,7 +46,7 @@ class AssignmentController extends Controller
     /**
      * @inheritdoc
      */
-    public function init(): void
+    public function init()
     {
         parent::init();
 
@@ -175,8 +175,8 @@ protected function findModel(int $id)
 
         if (($user = $class::findIdentity($id)) !== null) {
             return new AssignmentModel($user);
-        } else {
-            throw new NotFoundHttpException(Yii::t('yii2mod.rbac', 'The requested page does not exist.'));
         }
+
+        throw new NotFoundHttpException(Yii::t('yii2mod.rbac', 'The requested page does not exist.'));
     }
 }

models/AuthItemModel.php

@@ -98,7 +98,7 @@ public function rules(): array
     /**
      * Check role is unique
      */
-    public function unique(): void
+    public function unique()
     {
         $value = $this->name;
         if ($this->manager->getRole($value) !== null || $this->manager->getPermission($value) !== null) {
@@ -114,7 +114,7 @@ public function unique(): void
     /**
      * Check for rule
      */
-    public function checkRule(): void
+    public function checkRule()
     {
         $name = $this->ruleName;
 
@@ -292,7 +292,7 @@ public function getItems(): array
     /**
      * @return null|Item
      */
-    public function getItem(): ?Item
+    public function getItem()
     {
         return $this->_item;
     }

models/BizRuleModel.php

@@ -169,7 +169,7 @@ public function save(): bool
     /**
      * @return null|Rule
      */
-    public function getItem(): ?Rule
+    public function getItem()
     {
         return $this->_item;
     }

models/RouteModel.php

@@ -148,7 +148,7 @@ public function getAppRoutes(string $module = null): array
     /**
      * Invalidate the cache
      */
-    public function invalidate(): void
+    public function invalidate()
     {
         if ($this->cache !== null) {
             TagDependency::invalidate($this->cache, self::CACHE_TAG);
@@ -161,7 +161,7 @@ public function invalidate(): void
      * @param Module $module
      * @param array $result
      */
-    protected function getRouteRecursive(Module $module, &$result): void
+    protected function getRouteRecursive(Module $module, &$result)
     {
         if (!in_array($module->id, $this->excludeModules)) {
             $token = "Get Route of '" . get_class($module) . "' with id '" . $module->uniqueId . "'";
@@ -198,7 +198,7 @@ protected function getRouteRecursive(Module $module, &$result): void
      * @param string $prefix
      * @param mixed $result
      */
-    protected function getControllerFiles(Module $module, string $namespace, string $prefix, &$result): void
+    protected function getControllerFiles(Module $module, string $namespace, string $prefix, &$result)
     {
         $path = Yii::getAlias('@' . str_replace('\\', '/', $namespace), false);
         $token = "Get controllers from '$path'";
@@ -240,7 +240,7 @@ protected function getControllerFiles(Module $module, string $namespace, string
      * @param Module $module
      * @param mixed $result
      */
-    protected function getControllerActions($type, $id, Module $module, &$result): void
+    protected function getControllerActions($type, $id, Module $module, &$result)
     {
         $token = 'Create controller with config=' . VarDumper::dumpAsString($type) . " and id='$id'";
         Yii::beginProfile($token, __METHOD__);
@@ -264,7 +264,7 @@ protected function getControllerActions($type, $id, Module $module, &$result): v
      * @param Controller $controller
      * @param array $result all controller action
      */
-    protected function getActionRoutes(Controller $controller, &$result): void
+    protected function getActionRoutes(Controller $controller, &$result)
     {
         $token = "Get actions of controller '" . $controller->uniqueId . "'";
         Yii::beginProfile($token, __METHOD__);

tests/TestCase.php

@@ -10,6 +10,9 @@
  */
 class TestCase extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -19,6 +22,9 @@ protected function setUp()
         $this->setupTestDbData();
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function tearDown()
     {
         $this->destroyApplication();