Fix coding style errors

Author: moltam

.php_cs

@@ -0,0 +1,24 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__)
+    ->exclude([
+        'vendor',
+    ])
+;
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@Symfony' => true,
+        'yoda_style' => false,
+        'array_syntax' => ['syntax' => 'short'],
+        'concat_space' => ['spacing' => 'one'],
+        'phpdoc_align' => false,
+        'phpdoc_annotation_without_dot' => false,
+        'phpdoc_summary' => false,
+        'phpdoc_inline_tag' => false,
+        'heredoc_to_nowdoc' => false,
+        'phpdoc_add_missing_param_annotation' => ['only_untyped' => false],
+    ])
+    ->setFinder($finder)
+;

Component.php

@@ -6,11 +6,11 @@
 
 /**
  * Component.
- * 
+ *
  * Examples:
- * 
+ *
  * Minimal code:
- * 
+ *
  * ~~~
  * 'language' => 'en',
  * 'bootstrap' => ['languagepicker'],
@@ -21,9 +21,9 @@
  *      ]
  * ],
  * ~~~
- * 
+ *
  * Complete example:
- * 
+ *
  * ~~~
  * 'language' => 'en-US',
  * 'bootstrap' => ['languagepicker'],
@@ -44,21 +44,21 @@
  *      ]
  * ]
  * ~~~
- * 
+ *
  *
  * @author Lajos Molnar <[email protected]>
+ *
  * @since 1.0
  */
 class Component extends \yii\base\Component
 {
-    
     /**
      * @var function - function to execute after changing the language of the site.
      */
     public $callback;
 
     /**
-     * @var integer expiration date of the cookie storing the language of the site.
+     * @var int expiration date of the cookie storing the language of the site.
      */
     public $expireDays = 30;
 
@@ -76,28 +76,28 @@ class Component extends \yii\base\Component
     /**
      * @var array List of available languages
      *  Formats supported in the pre-defined skins:
-     * 
+     *
      * ~~~
      *  ['en', 'de', 'es']
      *  ['en' => 'English', 'de' => 'Deutsch', 'fr' => 'Français']
      *  ['en-US', 'de-DE', 'fr-FR']
      *  ['en-US' => 'English', 'de-DE' => 'Deutsch', 'fr-FR' => 'Français']
      * ~~~
-     * 
      */
     public $languages;
 
     /**
      * @inheritdoc
+     *
      * @param array $config
+     *
      * @throws \yii\base\InvalidConfigException
      */
-    public function __construct($config = array())
+    public function __construct($config = [])
     {
-
         if (empty($config['languages'])) {
             throw new \yii\base\InvalidConfigException('Missing languages');
-        } else if (is_callable($config['languages'])) {
+        } elseif (is_callable($config['languages'])) {
             $config['languages'] = call_user_func($config['languages']);
         }
 
@@ -109,7 +109,6 @@ public function __construct($config = array())
      */
     public function init()
     {
-
         $this->initLanguage();
 
         parent::init();
@@ -123,12 +122,13 @@ public function initLanguage()
         if (isset($_GET['language-picker-language'])) {
             if ($this->_isValidLanguage($_GET['language-picker-language'])) {
                 return $this->saveLanguage($_GET['language-picker-language']);
-            } else if (!Yii::$app->request->isAjax) {
+            } elseif (!Yii::$app->request->isAjax) {
                 return $this->_redirect();
             }
-        } else if (Yii::$app->request->cookies->has($this->cookieName)) {
+        } elseif (Yii::$app->request->cookies->has($this->cookieName)) {
             if ($this->_isValidLanguage(Yii::$app->request->cookies->getValue($this->cookieName))) {
                 Yii::$app->language = Yii::$app->request->cookies->getValue($this->cookieName);
+
                 return;
             } else {
                 Yii::$app->response->cookies->remove($this->cookieName);
@@ -140,12 +140,13 @@ public function initLanguage()
 
     /**
      * Saving language into cookie and database.
+     *
      * @param string $language - The language to save.
+     *
      * @return static
      */
     public function saveLanguage($language)
     {
-
         Yii::$app->language = $language;
         $this->saveLanguageIntoCookie($language);
 
@@ -170,6 +171,7 @@ public function detectLanguage()
             if ($this->_isValidLanguage($language)) {
                 Yii::$app->language = $language;
                 $this->saveLanguageIntoCookie($language);
+
                 return;
             }
         }
@@ -180,6 +182,7 @@ public function detectLanguage()
                 if (preg_match('/^' . $pattern . '/', $value) || preg_match('/^' . $pattern . '/', $key)) {
                     Yii::$app->language = $this->_isValidLanguage($key) ? $key : $value;
                     $this->saveLanguageIntoCookie(Yii::$app->language);
+
                     return;
                 }
             }
@@ -188,6 +191,7 @@ public function detectLanguage()
 
     /**
      * Save language into cookie.
+     *
      * @param string $language
      */
     public function saveLanguageIntoCookie($language)
@@ -196,30 +200,33 @@ public function saveLanguageIntoCookie($language)
             'name' => $this->cookieName,
             'domain' => $this->cookieDomain,
             'value' => $language,
-            'expire' => time() + 86400 * $this->expireDays
+            'expire' => time() + 86400 * $this->expireDays,
         ]);
 
         Yii::$app->response->cookies->add($cookie);
     }
 
     /**
      * Redirects the browser to the referer URL.
+     *
      * @return static
      */
     private function _redirect()
     {
         $redirect = Yii::$app->request->absoluteUrl == Yii::$app->request->referrer ? '/' : Yii::$app->request->referrer;
+
         return Yii::$app->response->redirect($redirect);
     }
 
     /**
      * Determines whether the language received as a parameter can be processed.
+     *
      * @param string $language
-     * @return boolean
+     *
+     * @return bool
      */
     private function _isValidLanguage($language)
     {
         return is_string($language) && (isset($this->languages[$language]) || in_array($language, $this->languages));
     }
-
-}
+}

bundles/LanguageLargeIconsAsset.php

@@ -6,11 +6,13 @@
 
 /**
  * LanguageLargeIcons asset bundle
+ *
  * @author Lajos Molnár <[email protected]>
+ *
  * @since 1.0
  */
-class LanguageLargeIconsAsset extends AssetBundle {
-
+class LanguageLargeIconsAsset extends AssetBundle
+{
     /**
      * @inheritdoc
      */
@@ -23,5 +25,4 @@ class LanguageLargeIconsAsset extends AssetBundle {
         'stylesheets/language-picker.min.css',
         'stylesheets/flags-large.min.css',
     ];
-
 }

bundles/LanguagePluginAsset.php

@@ -6,11 +6,13 @@
 
 /**
  * LanguagePlugin asset bundle
+ *
  * @author Lajos Molnár <[email protected]>
+ *
  * @since 1.0
  */
-class LanguagePluginAsset extends AssetBundle {
-
+class LanguagePluginAsset extends AssetBundle
+{
     /**
      * @inheritdoc
      */
@@ -29,5 +31,4 @@ class LanguagePluginAsset extends AssetBundle {
     public $depends = [
         'yii\web\JqueryAsset',
     ];
-
 }

bundles/LanguageSmallIconsAsset.php

@@ -6,11 +6,13 @@
 
 /**
  * LanguageSmallIcons asset bundle
+ *
  * @author Lajos Molnár <[email protected]>
+ *
  * @since 1.0
  */
-class LanguageSmallIconsAsset extends AssetBundle {
-
+class LanguageSmallIconsAsset extends AssetBundle
+{
     /**
      * @inheritdoc
      */
@@ -23,5 +25,4 @@ class LanguageSmallIconsAsset extends AssetBundle {
         'stylesheets/language-picker.min.css',
         'stylesheets/flags-small.min.css',
     ];
-
 }

composer.json

@@ -17,5 +17,12 @@
     },
     "require": {
         "yiisoft/yii2": "~2.0.0"
+    },
+    "require-dev": {
+        "friendsofphp/php-cs-fixer": "^2.11"
+    },
+    "scripts": {
+        "cs-fix": "php-cs-fixer fix --config=.php_cs",
+        "cs-check": "php-cs-fixer fix --config=.php_cs --dry-run --diff"
     }
 }