fix code style

Author: igor-chepurnoi

.php_cs

@@ -0,0 +1,22 @@
+<?php
+
+$finder = Symfony\CS\Finder::create()
+    ->exclude('vendor')
+    ->in([__DIR__]);
+
+$config = Symfony\CS\Config::create()
+    ->fixers([
+        '-phpdoc_params',
+        '-phpdoc_short_description',
+        '-phpdoc_inline_tag',
+        '-pre_increment',
+        '-heredoc_to_nowdoc',
+        '-spaces_cast',
+        '-include',
+        '-phpdoc_no_package',
+        'concat_with_spaces',
+        'ordered_use',
+    ])
+    ->finder($finder);
+
+return $config;

.travis.yml

@@ -5,14 +5,6 @@ php:
   - 5.5
   - 5.6
   - 7.0
-  - hhvm
-
-# run build against hhvm but allow them to fail
-# http://docs.travis-ci.com/user/build-configuration/#Rows-That-are-Allowed-To-Fail
-matrix:
-  fast_finish: true
-  allow_failures:
-    - php: hhvm
 
 # faster builds on new travis setup not using sudo
 sudo: false
@@ -21,6 +13,7 @@ sudo: false
 cache:
   directories:
     - $HOME/.composer/cache
+    - vendor
 
 install:
   - travis_retry composer self-update && composer --version
@@ -29,4 +22,5 @@ install:
   - travis_retry composer install --prefer-dist --no-interaction
 
 script:
-  - phpunit --verbose $PHPUNIT_FLAGS
+  - vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --dry-run --diff
+  - phpunit --verbose $PHPUNIT_FLAGS

ConsoleModule.php

@@ -21,7 +21,7 @@
 class ConsoleModule extends Module
 {
     /**
-     * @var string the namespace that controller classes are in.
+     * @var string the namespace that controller classes are in
      */
     public $controllerNamespace = 'yii2mod\rbac\commands';
-}
+}

Module.php

@@ -23,17 +23,16 @@
  *     ]
  * ],
  * ~~~
- *
  */
 class Module extends \yii\base\Module
 {
     /**
-     * @var string the default route of this module. Defaults to 'default'.
+     * @var string the default route of this module. Defaults to 'default'
      */
     public $defaultRoute = 'assignment';
 
     /**
-     * @var string the namespace that controller classes are in.
+     * @var string the namespace that controller classes are in
      */
     public $controllerNamespace = 'yii2mod\rbac\controllers';
-}
+}

RbacAsset.php

@@ -6,6 +6,7 @@
 
 /**
  * Class RbacAsset
+ *
  * @package yii2mod\rbac
  */
 class RbacAsset extends AssetBundle
@@ -19,7 +20,7 @@ class RbacAsset extends AssetBundle
      * @var array
      */
     public $js = [
-        'js/rbac.js'
+        'js/rbac.js',
     ];
 
     public $css = [
@@ -30,7 +31,7 @@ class RbacAsset extends AssetBundle
      * @var array
      */
     public $depends = [
-        'yii\web\YiiAsset'
+        'yii\web\YiiAsset',
     ];
 
     /**
@@ -45,9 +46,9 @@ public function init()
     {
         if ($this->registerOnlyRouteScript) {
             $this->js = [
-                'js/rbac-route.js'
+                'js/rbac-route.js',
             ];
         }
         parent::init();
     }
-}
+}

base/ItemController.php

@@ -13,12 +13,13 @@
 
 /**
  * Class ItemController
+ *
  * @package yii2mod\rbac\base
  */
 class ItemController extends Controller
 {
     /**
-     * @var integer Type of Auth Item
+     * @var int Type of Auth Item
      */
     protected $type;
 
@@ -42,16 +43,16 @@ public function behaviors()
                     'update' => ['get', 'post'],
                     'delete' => ['post'],
                     'assign' => ['post'],
-                    'remove' => ['post']
-                ]
+                    'remove' => ['post'],
+                ],
             ],
             'contentNegotiator' => [
                 'class' => 'yii\filters\ContentNegotiator',
                 'only' => ['assign', 'remove'],
                 'formats' => [
-                    'application/json' => Response::FORMAT_JSON
-                ]
-            ]
+                    'application/json' => Response::FORMAT_JSON,
+                ],
+            ],
         ];
     }
 
@@ -75,6 +76,7 @@ public function actionIndex()
      * Displays a single AuthItem model.
      *
      * @param  string $id
+     *
      * @return mixed
      */
     public function actionView($id)
@@ -93,11 +95,12 @@ public function actionView($id)
      */
     public function actionCreate()
     {
-        $model = new AuthItemModel;
+        $model = new AuthItemModel();
         $model->type = $this->type;
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             Yii::$app->session->setFlash('success', Yii::t('yii2mod.rbac', 'Item has been saved.'));
+
             return $this->redirect(['view', 'id' => $model->name]);
         }
 
@@ -110,6 +113,7 @@ public function actionCreate()
      * If update is successful, the browser will be redirected to the 'view' page.
      *
      * @param string $id
+     *
      * @return mixed
      */
     public function actionUpdate($id)
@@ -118,6 +122,7 @@ public function actionUpdate($id)
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             Yii::$app->session->setFlash('success', Yii::t('yii2mod.rbac', 'Item has been saved.'));
+
             return $this->redirect(['view', 'id' => $model->name]);
         }
 
@@ -130,6 +135,7 @@ public function actionUpdate($id)
      * If deletion is successful, the browser will be redirected to the 'index' page.
      *
      * @param string $id
+     *
      * @return mixed
      */
     public function actionDelete($id)
@@ -145,6 +151,7 @@ public function actionDelete($id)
      * Assign items
      *
      * @param string $id
+     *
      * @return array
      */
     public function actionAssign($id)
@@ -160,6 +167,7 @@ public function actionAssign($id)
      * Remove items
      *
      * @param string $id
+     *
      * @return array
      */
     public function actionRemove($id)
@@ -201,6 +209,7 @@ public function getLabels()
      * If the model is not found, a 404 HTTP exception will be thrown.
      *
      * @param string $id
+     *
      * @return AuthItemModel the loaded model
      *
      * @throws NotFoundHttpException if the model cannot be found
@@ -216,4 +225,4 @@ protected function findModel($id)
             throw new NotFoundHttpException(Yii::t('yii2mod.rbac', 'The requested page does not exist.'));
         }
     }
-}
+}

commands/MigrateController.php

@@ -10,6 +10,7 @@
 
 /**
  * Class MigrateController
+ *
  * @package yii2mod\rbac\commands
  *
  * Below are some common usages of this command:
@@ -28,7 +29,7 @@
 class MigrateController extends BaseMigrateController
 {
     /**
-     * @var Connection The database connection.
+     * @var Connection The database connection
      */
     public $db = 'db';
 
@@ -128,4 +129,4 @@ protected function createMigrationHistoryTable()
 
         $this->stdout("Done.\n", Console::FG_GREEN);
     }
-}
+}

composer.json

@@ -1,7 +1,15 @@
 {
     "name": "yii2mod/yii2-rbac",
     "description": "RBAC management module for Yii2",
-    "keywords": ["yii2", "yii2-rbac", "rbac management", "yii2mod", "rbac gui", "yii rbac", "rbac module"],
+    "keywords": [
+        "yii2",
+        "yii2-rbac",
+        "rbac management",
+        "yii2mod",
+        "rbac gui",
+        "yii rbac",
+        "rbac module"
+    ],
     "type": "yii2-extension",
     "license": "MIT",
     "authors": [
@@ -19,6 +27,9 @@
         "2amigos/yii2-arrayquery-component": "*",
         "yiisoft/yii2-jui": "*"
     },
+    "require-dev": {
+        "friendsofphp/php-cs-fixer": "~1.7"
+    },
     "autoload": {
         "psr-4": {
             "yii2mod\\rbac\\": ""