itstructure / yii2-template-multilanguage

config/console.php

Spacing +6 added lines, -6 removed lines

@@ -3,13 +3,13 @@ 
 use Itstructure\AdminModule\Module as AdminModule;
 use Itstructure\MFUploader\Module as MFUModule;
 
-$params = require __DIR__ . '/params.php';
-$db = require __DIR__ . '/db.php';
+$params = require __DIR__.'/params.php';
+$db = require __DIR__.'/db.php';
 
 $config = [
     'id' => 'yii2-template-multilanguage-console',
     'basePath' => dirname(__DIR__),
-    'bootstrap' => ['log'],
+    'bootstrap' => [ 'log' ],
     'controllerNamespace' => 'app\commands',
     'aliases' => [
         '@bower' => '@vendor/bower-asset',
@@ -31,7 +31,7 @@ 
             'targets' => [
                 [
                     'class' => 'yii\log\FileTarget',
-                    'levels' => ['error', 'warning'],
+                    'levels' => [ 'error', 'warning' ],
                 ],
             ],
         ],
@@ -63,8 +63,8 @@ 
 
 if (YII_ENV_DEV) {
     // configuration adjustments for 'dev' environment
-    $config['bootstrap'][] = 'gii';
-    $config['modules']['gii'] = [
+    $config[ 'bootstrap' ][ ] = 'gii';
+    $config[ 'modules' ][ 'gii' ] = [
         'class' => 'yii\gii\Module',
     ];
 }

config/admin/view-component.php

Spacing +1 added lines, -1 removed lines

@@ -9,5 +9,5 @@
     //'mainMenuConfig' => require __DIR__ . '/main-menu.php',
     'companyName' => 'Yii2 template',
     'shotCompanyName' => 'YTM',
-    'extraAssets' => require __DIR__ . '/extra-assets.php',
+    'extraAssets' => require __DIR__.'/extra-assets.php',
 ];

config/test_db.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
-$db = require __DIR__ . '/db.php';
+$db = require __DIR__.'/db.php';
 // test database! Important not to run tests on production or development databases
-$db['dsn'] = 'mysql:host=localhost;dbname=yii2_basic_tests';
+$db[ 'dsn' ] = 'mysql:host=localhost;dbname=yii2_basic_tests';
 
 return $db;

config/test.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-$params = require __DIR__ . '/params.php';
-$db = require __DIR__ . '/test_db.php';
+$params = require __DIR__.'/params.php';
+$db = require __DIR__.'/test_db.php';
 
 /**
  * Application configuration shared by all test types
@@ -19,7 +19,7 @@ 
             'useFileTransport' => true,
         ],
         'assetManager' => [
-            'basePath' => __DIR__ . '/../web/assets',
+            'basePath' => __DIR__.'/../web/assets',
         ],
         'urlManager' => [
             'showScriptName' => true,

traits/ResponseTrait.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
         int $statusCode = 200): array {
 
         if (null === $data) {
-            $data = (object)[];
+            $data = (object)[ ];
         }
 
         \Yii::$app->response->statusCode = $statusCode;

traits/AdminBeforeActionTrait.php

Spacing +9 added lines, -9 removed lines

@@ -34,24 +34,24 @@
      */
     public function beforeAction($action)
     {
-        $this->view->mainMenuConfig = require __DIR__ . '/../config/admin/main-menu.php';
+        $this->view->mainMenuConfig = require __DIR__.'/../config/admin/main-menu.php';
 
-        $this->view->homeUrl = '/' . $this->shortLanguage . '/admin';
+        $this->view->homeUrl = '/'.$this->shortLanguage.'/admin';
 
-        $this->view->signOutLink = '/' . $this->shortLanguage . '/logout';
+        $this->view->signOutLink = '/'.$this->shortLanguage.'/logout';
 
-        $this->view->profileLink = '/' . $this->shortLanguage . '/admin/users/view?id='.Yii::$app->getUser()->id;
+        $this->view->profileLink = '/'.$this->shortLanguage.'/admin/users/view?id='.Yii::$app->getUser()->id;
 
-        Yii::$app->getUser()->loginUrl = '/' . $this->shortLanguage . '/login';
+        Yii::$app->getUser()->loginUrl = '/'.$this->shortLanguage.'/login';
 
-        $this->urlPrefix = '/' . $this->shortLanguage . '/' . $this->module->id . '/' . $action->controller->id . '/';
+        $this->urlPrefix = '/'.$this->shortLanguage.'/'.$this->module->id.'/'.$action->controller->id.'/';
 
         if (array_key_exists($action->controller->id, $this->neighborControllers)) {
-            $this->urlPrefixNeighbor = '/' . $this->shortLanguage . '/' . $this->module->id . '/' .
-                $this->neighborControllers[$action->controller->id] . '/';
+            $this->urlPrefixNeighbor = '/'.$this->shortLanguage.'/'.$this->module->id.'/'.
+                $this->neighborControllers[ $action->controller->id ].'/';
         }
 
-        $this->view->userBody = ArrayHelper::map($this->languages, 'name', function ($item) {
+        $this->view->userBody = ArrayHelper::map($this->languages, 'name', function($item) {
             /* @var Language $item */
             return BaseHelper::getSwitchLanguageLink($item->getShortName(), Yii::$app->request);
         });

traits/LanguageTrait.php

Spacing +2 added lines, -2 removed lines

@@ -41,9 +41,9 @@
             '!=', 'shortName', $this->shortLanguage
         ])->all();
 
-        $this->view->params['languages'] = $this->languages;
+        $this->view->params[ 'languages' ] = $this->languages;
 
-        $this->view->params['shortLanguage'] = $this->shortLanguage;
+        $this->view->params[ 'shortLanguage' ] = $this->shortLanguage;
 
         parent::init();
     }

helpers/BaseHelper.php

Spacing +9 added lines, -9 removed lines

@@ -39,9 +39,9 @@ 
 
         $urlArray = explode('/', $url);
 
-        $urlArray[0] = $newShortLanguage;
+        $urlArray[ 0 ] = $newShortLanguage;
 
-        return '/' . implode('/', $urlArray);
+        return '/'.implode('/', $urlArray);
     }
 
     /**
@@ -73,19 +73,19 @@ 
      */
     public static function detectClientShortLanguage()
     {
-        if (!isset($_SERVER["HTTP_ACCEPT_LANGUAGE"]) || empty($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
+        if (!isset($_SERVER[ "HTTP_ACCEPT_LANGUAGE" ]) || empty($_SERVER[ "HTTP_ACCEPT_LANGUAGE" ])) {
             return null;
         }
 
         preg_match_all('/([a-z]{1,8}(?:-[a-z]{1,8})?)(?:;q=([0-9.]+))?/',
-            strtolower($_SERVER["HTTP_ACCEPT_LANGUAGE"]),
+            strtolower($_SERVER[ "HTTP_ACCEPT_LANGUAGE" ]),
             $matches
         );
 
-        $langs = array_combine($matches[1], $matches[2]);
+        $langs = array_combine($matches[ 1 ], $matches[ 2 ]);
 
         foreach ($langs as $n => $v) {
-            $langs[$n] = $v ? $v : 1; // If no q, then set q = 1
+            $langs[ $n ] = $v ? $v : 1; // If no q, then set q = 1
         }
 
         arsort($langs); // Sort descending q
@@ -103,11 +103,11 @@ 
         $fields = array('HTTP_CLIENT_IP', 'HTTP_X_REAL_IP', 'HTTP_X_FORWARDED_FOR', 'REMOTE_ADDR');
 
         $ip = "0.0.0.0";
-        foreach($fields as $k)
+        foreach ($fields as $k)
         {
-            if(!empty($_SERVER[$k]) && ip2long($_SERVER[$k]) != false)
+            if (!empty($_SERVER[ $k ]) && ip2long($_SERVER[ $k ]) != false)
             {
-                $ip = $_SERVER[$k];
+                $ip = $_SERVER[ $k ];
             }
         }
 

helpers/InitialUserSettings.php

Spacing +4 added lines, -4 removed lines

@@ -63,8 +63,8 @@ 
     private static function setUserStatus(TableSchema $settingsTableSchema, $settings, IdentityInterface $user): void
     {
         if (in_array('initUserStatus', $settingsTableSchema->columnNames)) {
-            $user->status = is_array($settings) && null !== $settings['initUserStatus'] ?
-                $settings['initUserStatus'] : self::INIT_USER_STATUS;
+            $user->status = is_array($settings) && null !== $settings[ 'initUserStatus' ] ?
+                $settings[ 'initUserStatus' ] : self::INIT_USER_STATUS;
             $user->save();
         } else {
             Yii::error('Field "initUserStatus" does not exists in "settings" table to set initial user status.');
@@ -93,11 +93,11 @@ 
                 ]);
             }
 
-            if (!is_array($settings) || null === $settings['initUserRole']) {
+            if (!is_array($settings) || null === $settings[ 'initUserRole' ]) {
                 $initUserRole = self::INIT_USER_ROLE;
                 Yii::error('Can not get field value of "initUserRole" from "settings" table to set initial user role.');
             } else {
-                $initUserRole = $settings['initUserRole'];
+                $initUserRole = $settings[ 'initUserRole' ];
             }
 
             $authManager->assign(