fix code style, require php version >= 5.5

.php_cs

@@ -0,0 +1,23 @@
+<?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',
+        'short_array_syntax',
+    ])
+    ->finder($finder);
+
+return $config;

.travis.yml

@@ -1,18 +1,9 @@
 language: php
 
 php:
-  - 5.4
   - 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 +12,7 @@ sudo: false
 cache:
   directories:
     - $HOME/.composer/cache
+    - vendor
 
 install:
   - travis_retry composer self-update && composer --version
@@ -29,4 +21,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

Module.php

@@ -4,12 +4,13 @@
 
 /**
  * Class Module
+ *
  * @package yii2mod\settings
  */
 class Module extends \yii\base\Module
 {
     /**
-     * @var string the namespace that controller classes are in.
+     * @var string the namespace that controller classes are in
      */
     public $controllerNamespace = 'yii2mod\settings\controllers';
-}
+}

components/Settings.php

@@ -3,14 +3,15 @@
 namespace yii2mod\settings\components;
 
 use Yii;
-use yii\helpers\ArrayHelper;
 use yii\base\Component;
 use yii\caching\Cache;
 use yii\di\Instance;
+use yii\helpers\ArrayHelper;
 use yii2mod\settings\models\enumerables\SettingType;
 
 /**
  * Class Settings
+ *
  * @package yii2mod\settings\components
  */
 class Settings extends Component
@@ -27,8 +28,7 @@ class Settings extends Component
      * - a configuration array
      * - a [[yii\caching\Cache]] object
      *
-     * When this is not set, it means caching is not enabled.
-     *
+     * When this is not set, it means caching is not enabled
      */
     public $cache = 'cache';
 
@@ -60,7 +60,7 @@ public function init()
         parent::init();
 
         if ($this->cache !== null) {
-            $this->cache = Instance::ensure($this->cache, Cache::className());
+            $this->cache = Instance::ensure($this->cache, Cache::class);
         }
 
         $this->model = Yii::createObject($this->modelClass);
@@ -72,6 +72,7 @@ public function init()
      * @param string $section
      * @param string $key
      * @param null $default
+     *
      * @return mixed
      */
     public function get($section, $key, $default = null)
@@ -96,6 +97,7 @@ public function get($section, $key, $default = null)
      * @param string $key
      * @param string $value
      * @param null $type
+     *
      * @return bool
      */
     public function set($section, $key, $value, $type = null)
@@ -114,6 +116,7 @@ public function set($section, $key, $value, $type = null)
      *
      * @param string $section
      * @param string $key
+     *
      * @return bool
      */
     public function has($section, $key)
@@ -128,6 +131,7 @@ public function has($section, $key)
      *
      * @param string $section
      * @param string $key
+     *
      * @return bool
      */
     public function remove($section, $key)
@@ -156,6 +160,7 @@ public function removeAll()
      *
      * @param string $key
      * @param string $section
+     *
      * @return bool
      */
     public function activate($section, $key)
@@ -168,6 +173,7 @@ public function activate($section, $key)
      *
      * @param string $key
      * @param string $section
+     *
      * @return bool
      */
     public function deactivate($section, $key)
@@ -225,4 +231,4 @@ protected function convertSettingType($type)
             settype($this->setting, $type);
         }
     }
-}
+}

composer.json

@@ -1,23 +1,32 @@
 {
-  "name": "yii2mod/yii2-settings",
-  "description": "Yii2 Settings Module",
-  "type": "yii2-extension",
-  "keywords": ["yii2", "settings", "config", "storage"],
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "Igor Chepurnoy",
-      "email": "[email protected]"
+    "name": "yii2mod/yii2-settings",
+    "description": "Yii2 Settings Module",
+    "type": "yii2-extension",
+    "keywords": [
+        "yii2",
+        "settings",
+        "config",
+        "storage"
+    ],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Igor Chepurnoy",
+            "email": "[email protected]"
+        }
+    ],
+    "require": {
+        "php": ">=5.5",
+        "yiisoft/yii2": ">=2.0.8",
+        "yii2mod/yii2-editable": "*",
+        "yii2mod/yii2-enum": "*"
+    },
+    "require-dev": {
+        "friendsofphp/php-cs-fixer": "~1.7"
+    },
+    "autoload": {
+        "psr-4": {
+            "yii2mod\\settings\\": ""
+        }
     }
-  ],
-  "require": {
-    "yiisoft/yii2": ">=2.0.8",
-    "yii2mod/yii2-editable": "*",
-    "yii2mod/yii2-enum": "*"
-  },
-  "autoload": {
-    "psr-4": {
-      "yii2mod\\settings\\": ""
-    }
-  }
 }

controllers/DefaultController.php

@@ -3,14 +3,15 @@
 namespace yii2mod\settings\controllers;
 
 use Yii;
-use yii2mod\editable\EditableAction;
-use yii2mod\settings\models\SettingModel;
+use yii\filters\VerbFilter;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
-use yii\filters\VerbFilter;
+use yii2mod\editable\EditableAction;
+use yii2mod\settings\models\SettingModel;
 
 /**
  * Class SettingController
+ *
  * @package yii2mod\settings\controllers
  */
 class DefaultController extends Controller
@@ -49,14 +50,14 @@ public function behaviors()
     {
         return [
             'verbs' => [
-                'class' => VerbFilter::className(),
+                'class' => VerbFilter::class,
                 'actions' => [
                     'index' => ['get'],
                     'create' => ['get', 'post'],
                     'update' => ['get', 'post'],
-                    'delete' => ['post']
-                ]
-            ]
+                    'delete' => ['post'],
+                ],
+            ],
         ];
     }
 
@@ -69,10 +70,10 @@ public function actions()
     {
         return [
             'edit-setting' => [
-                'class' => EditableAction::className(),
-                'modelClass' => SettingModel::className(),
-                'forceCreate' => false
-            ]
+                'class' => EditableAction::class,
+                'modelClass' => SettingModel::class,
+                'forceCreate' => false,
+            ],
         ];
     }
 
@@ -105,6 +106,7 @@ public function actionCreate()
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             Yii::$app->session->setFlash('success', Yii::t('yii2mod.settings', 'Setting has been created.'));
+
             return $this->redirect(['index']);
         } else {
             return $this->render($this->createView, [
@@ -118,7 +120,8 @@ public function actionCreate()
      *
      * If update is successful, the browser will be redirected to the 'view' page.
      *
-     * @param integer $id
+     * @param int $id
+     *
      * @return mixed
      */
     public function actionUpdate($id)
@@ -127,6 +130,7 @@ public function actionUpdate($id)
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             Yii::$app->session->setFlash('success', Yii::t('yii2mod.settings', 'Setting has been updated.'));
+
             return $this->redirect(['index']);
         } else {
             return $this->render($this->updateView, [
@@ -140,13 +144,15 @@ public function actionUpdate($id)
      *
      * If deletion is successful, the browser will be redirected to the 'index' page.
      *
-     * @param integer $id
+     * @param int $id
+     *
      * @return mixed
      */
     public function actionDelete($id)
     {
         $this->findModel($id)->delete();
         Yii::$app->session->setFlash('success', Yii::t('yii2mod.settings', 'Setting has been deleted.'));
+
         return $this->redirect(['index']);
     }
 
@@ -155,7 +161,8 @@ public function actionDelete($id)
      *
      * If the model is not found, a 404 HTTP exception will be thrown.
      *
-     * @param integer $id
+     * @param int $id
+     *
      * @return SettingModel the loaded model
      *
      * @throws NotFoundHttpException if the model cannot be found
@@ -170,4 +177,4 @@ protected function findModel($id)
             throw new NotFoundHttpException(Yii::t('yii2mod.settings', 'The requested page does not exist.'));
         }
     }
-}
+}

messages/en/yii2mod.settings.php

@@ -47,5 +47,5 @@
     'Setting has been created.' => 'Setting has been created.',
     'Setting has been updated.' => 'Setting has been updated.',
     'Setting has been deleted.' => 'Setting has been deleted.',
-    'The requested page does not exist.' => 'The requested page does not exist.'
+    'The requested page does not exist.' => 'The requested page does not exist.',
 ];

messages/ru/yii2mod.settings.php

@@ -47,5 +47,5 @@
     'Setting has been created.' => 'Настройка была сохранена.',
     'Setting has been updated.' => 'Настройка была обновлена.',
     'Setting has been deleted.' => 'Настройка была удалена.',
-    'The requested page does not exist.' => 'Ошибка 404 - страница не найдена!'
+    'The requested page does not exist.' => 'Ошибка 404 - страница не найдена!',
 ];

messages/uk/yii2mod.settings.php

@@ -47,5 +47,5 @@
     'Setting has been created.' => 'Налаштування було створено.',
     'Setting has been updated.' => 'Налаштування було оновлено.',
     'Setting has been deleted.' => 'Налаштування було видалено.',
-    'The requested page does not exist.' => 'Помилка 404 - сторінка не знайдена!'
+    'The requested page does not exist.' => 'Помилка 404 - сторінка не знайдена!',
 ];

migrations/m150227_114524_init.php

@@ -26,7 +26,7 @@ public function up()
             'value' => $this->text()->notNull(),
             'status' => $this->smallInteger()->notNull()->defaultValue(1),
             'createdAt' => $this->integer()->notNull(),
-            'updatedAt' => $this->integer()->notNull()
+            'updatedAt' => $this->integer()->notNull(),
         ], $tableOptions);
     }
 

migrations/m161109_104201_rename_setting_table.php

@@ -17,4 +17,4 @@ public function down()
             $this->renameTable('{{%setting}}', '{{%Setting}}');
         }
     }
-}
+}