require php 7.1, update tests configuration

Author: igor-chepurnoi

.travis.yml

@@ -13,10 +13,9 @@ cache:
 
 install:
   - travis_retry composer self-update && composer --version
-  - travis_retry composer global require "fxp/composer-asset-plugin:~1.3.1"
   - export PATH="$HOME/.composer/vendor/bin:$PATH"
   - travis_retry composer install --prefer-dist --no-interaction
 
 script:
   - vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --dry-run --diff
-  - phpunit --verbose $PHPUNIT_FLAGS
+  - phpunit --verbose

README.md

@@ -29,7 +29,7 @@ php composer.phar require --prefer-dist yii2mod/yii2-rbac "*"
 
 or add
 
-```json
+```
 "yii2mod/yii2-rbac": "*"
 ```
 
@@ -43,19 +43,17 @@ Once the extension is installed, simply modify your application configuration as
 return [
     //....
     'modules' => [
-        'admin' => [
-            'class' => 'app\modules\admin\Module',
-            'modules' => [
-                'rbac' => [
-                    'class' => 'yii2mod\rbac\Module',
-                ],
+        'class' => 'app\modules\admin\Module',
+        'modules' => [
+            'rbac' => [
+                'class' => 'yii2mod\rbac\Module',
             ],
         ],
     ],
   'components' => [
          'authManager' => [
             'class' => 'yii\rbac\DbManager',
-            'defaultRoles' => ['guest', 'user']
+            'defaultRoles' => ['guest', 'user'],
         ],
     ]
 ];
@@ -68,12 +66,23 @@ $ php yii migrate/up --migrationPath=@yii/rbac/migrations
 ```
 
 You can then access Auth manager through the following URL:
+
+```
+http://localhost/path/to/index.php?r=rbac/
+http://localhost/path/to/index.php?r=rbac/route
+http://localhost/path/to/index.php?r=rbac/permission
+http://localhost/path/to/index.php?r=rbac/role
+http://localhost/path/to/index.php?r=rbac/assignment
+```
+
+or if you have enabled pretty URLs, you may use the following URL:
+
 ```
-http://localhost/path/to/index.php?r=admin/rbac/
-http://localhost/path/to/index.php?r=admin/rbac/route
-http://localhost/path/to/index.php?r=admin/rbac/permission
-http://localhost/path/to/index.php?r=admin/rbac/role
-http://localhost/path/to/index.php?r=admin/rbac/assignment
+http://localhost/path/to/index.php/rbac
+http://localhost/path/to/index.php/rbac/route
+http://localhost/path/to/index.php/rbac/permission
+http://localhost/path/to/index.php/rbac/role
+http://localhost/path/to/index.php/rbac/assignment
 ```
 
 **Applying rules:**

base/ItemController.php

@@ -38,7 +38,7 @@ class ItemController extends Controller
     /**
      * @inheritdoc
      */
-    public function behaviors()
+    public function behaviors(): array
     {
         return [
             'verbs' => [
@@ -83,11 +83,11 @@ public function actionIndex()
     /**
      * Displays a single AuthItem model.
      *
-     * @param  string $id
+     * @param int $id
      *
      * @return mixed
      */
-    public function actionView($id)
+    public function actionView(int $id)
     {
         $model = $this->findModel($id);
 
@@ -120,11 +120,11 @@ public function actionCreate()
      *
      * If update is successful, the browser will be redirected to the 'view' page.
      *
-     * @param string $id
+     * @param int $id
      *
      * @return mixed
      */
-    public function actionUpdate($id)
+    public function actionUpdate(int $id)
     {
         $model = $this->findModel($id);
 
@@ -142,11 +142,11 @@ public function actionUpdate($id)
      *
      * If deletion is successful, the browser will be redirected to the 'index' page.
      *
-     * @param string $id
+     * @param int $id
      *
      * @return mixed
      */
-    public function actionDelete($id)
+    public function actionDelete(int $id)
     {
         $model = $this->findModel($id);
         Yii::$app->getAuthManager()->remove($model->item);
@@ -158,11 +158,11 @@ public function actionDelete($id)
     /**
      * Assign items
      *
-     * @param string $id
+     * @param int $id
      *
      * @return array
      */
-    public function actionAssign($id)
+    public function actionAssign(int $id)
     {
         $items = Yii::$app->getRequest()->post('items', []);
         $model = $this->findModel($id);
@@ -174,11 +174,11 @@ public function actionAssign($id)
     /**
      * Remove items
      *
-     * @param string $id
+     * @param int $id
      *
      * @return array
      */
-    public function actionRemove($id)
+    public function actionRemove(int $id): array
     {
         $items = Yii::$app->getRequest()->post('items', []);
         $model = $this->findModel($id);
@@ -190,23 +190,23 @@ public function actionRemove($id)
     /**
      * @inheritdoc
      */
-    public function getViewPath()
+    public function getViewPath(): string
     {
         return $this->module->getViewPath() . DIRECTORY_SEPARATOR . 'item';
     }
 
     /**
      * @return int
      */
-    public function getType()
+    public function getType(): int
     {
         return $this->type;
     }
 
     /**
      * @return array
      */
-    public function getLabels()
+    public function getLabels(): array
     {
         return $this->labels;
     }
@@ -216,13 +216,13 @@ public function getLabels()
      *
      * If the model is not found, a 404 HTTP exception will be thrown.
      *
-     * @param string $id
+     * @param int $id
      *
      * @return AuthItemModel the loaded model
      *
      * @throws NotFoundHttpException if the model cannot be found
      */
-    protected function findModel($id)
+    protected function findModel(int $id): AuthItemModel
     {
         $auth = Yii::$app->getAuthManager();
         $item = $this->type === Item::TYPE_ROLE ? $auth->getRole($id) : $auth->getPermission($id);

commands/MigrateController.php

@@ -11,8 +11,6 @@
 /**
  * Class MigrateController
  *
- * @package yii2mod\rbac\commands
- *
  * Below are some common usages of this command:
  *
  * ```
@@ -51,16 +49,17 @@ class MigrateController extends BaseMigrateController
     /**
      * @inheritdoc
      */
-    public function init()
+    public function init(): void
     {
         $this->db = Instance::ensure($this->db, Connection::class);
+
         parent::init();
     }
 
     /**
-     * @return array|string|Connection
+     * @return Connection
      */
-    public function getDb()
+    public function getDb(): Connection
     {
         return $this->db;
     }

composer.json

@@ -22,8 +22,8 @@
         }
     ],
     "require": {
-        "php": ">=5.6",
-        "yiisoft/yii2": "^2.0.8",
+        "php": ">=7.1",
+        "yiisoft/yii2": "~2.0.10",
         "2amigos/yii2-arrayquery-component": "*",
         "yiisoft/yii2-jui": "*"
     },
@@ -34,5 +34,11 @@
         "psr-4": {
             "yii2mod\\rbac\\": ""
         }
-    }
+    },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org"
+        }
+    ]
 }

filters/AccessControl.php

@@ -28,7 +28,7 @@ class AccessControl extends \yii\filters\AccessControl
     /**
      * @inheritdoc
      */
-    public function beforeAction($action)
+    public function beforeAction($action): bool
     {
         $controller = $action->controller;
         $params = ArrayHelper::getValue($this->params, $action->id, []);
@@ -50,7 +50,7 @@ public function beforeAction($action)
     /**
      * @inheritdoc
      */
-    protected function isActive($action)
+    protected function isActive($action): bool
     {
         if ($this->isErrorPage($action) || $this->isLoginPage($action) || $this->isAllowedAction($action)) {
             return false;
@@ -66,7 +66,7 @@ protected function isActive($action)
      *
      * @return bool
      */
-    private function isErrorPage($action)
+    private function isErrorPage(Action $action): bool
     {
         if ($action->getUniqueId() === Yii::$app->getErrorHandler()->errorAction) {
             return true;
@@ -82,7 +82,7 @@ private function isErrorPage($action)
      *
      * @return bool
      */
-    private function isLoginPage($action)
+    private function isLoginPage(Action $action): bool
     {
         $loginUrl = trim(Url::to(Yii::$app->user->loginUrl), '/');
 
@@ -100,7 +100,7 @@ private function isLoginPage($action)
      *
      * @return bool
      */
-    private function isAllowedAction($action)
+    private function isAllowedAction(Action $action): bool
     {
         if ($this->owner instanceof Module) {
             $ownerId = $this->owner->getUniqueId();

migrations/Migration.php

@@ -31,6 +31,7 @@ class Migration extends Component implements MigrationInterface
     public function init()
     {
         $this->authManager = Instance::ensure($this->authManager, DbManager::class);
+
         parent::init();
     }
 

models/AssignmentModel.php

@@ -55,9 +55,9 @@ public function __construct(IdentityInterface $user, $config = [])
      *
      * @param array $items
      *
-     * @return int number of successful grand
+     * @return bool
      */
-    public function assign($items)
+    public function assign(array $items): bool
     {
         foreach ($items as $name) {
             $item = $this->manager->getRole($name);
@@ -73,9 +73,9 @@ public function assign($items)
      *
      * @param array $items
      *
-     * @return int number of successful revoke
+     * @return bool
      */
-    public function revoke($items)
+    public function revoke(array $items): bool
     {
         foreach ($items as $name) {
             $item = $this->manager->getRole($name);
@@ -91,7 +91,7 @@ public function revoke($items)
      *
      * @return array
      */
-    public function getItems()
+    public function getItems(): array
     {
         $available = [];
         $assigned = [];