itstructure / yii2-template-multilanguage

models/UserSearch.php

Spacing +9 added lines, -9 removed lines

@@ -78,8 +78,8 @@ 
         $dataProvider->setSort([
             'attributes' => [
                 'order' => [
-                    'asc' => ['order' => SORT_ASC],
-                    'desc' => ['order' => SORT_DESC],
+                    'asc' => [ 'order' => SORT_ASC ],
+                    'desc' => [ 'order' => SORT_DESC ],
                     'label' => 'Order',
                     'default' => SORT_ASC
                 ],
@@ -103,13 +103,13 @@ 
             'updated_at' => $this->updated_at,
         ]);
 
-        $query->andFilterWhere(['like', 'first_name', $this->first_name])
-            ->andFilterWhere(['like', 'last_name', $this->last_name])
-            ->andFilterWhere(['like', 'patronymic', $this->patronymic])
-            ->andFilterWhere(['like', 'position', $this->position])
-            ->andFilterWhere(['like', 'login', $this->login])
-            ->andFilterWhere(['like', 'email', $this->email])
-            ->andFilterWhere(['like', 'phone', $this->phone]);
+        $query->andFilterWhere([ 'like', 'first_name', $this->first_name ])
+            ->andFilterWhere([ 'like', 'last_name', $this->last_name ])
+            ->andFilterWhere([ 'like', 'patronymic', $this->patronymic ])
+            ->andFilterWhere([ 'like', 'position', $this->position ])
+            ->andFilterWhere([ 'like', 'login', $this->login ])
+            ->andFilterWhere([ 'like', 'email', $this->email ])
+            ->andFilterWhere([ 'like', 'phone', $this->phone ]);
 
         $query->orderBy('order ASC');
 

models/ContactSocial.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
                     'social_id'
                 ],
                 'unique',
-                'targetAttribute' => ['contacts_id', 'social_id']
+                'targetAttribute' => [ 'contacts_id', 'social_id' ]
             ],
             [
                 [
@@ -58,7 +58,7 @@ 
                 'exist',
                 'skipOnError' => true,
                 'targetClass' => Contact::class,
-                'targetAttribute' => ['contacts_id' => 'id']
+                'targetAttribute' => [ 'contacts_id' => 'id' ]
             ],
             [
                 [
@@ -67,7 +67,7 @@ 
                 'exist',
                 'skipOnError' => true,
                 'targetClass' => Social::class,
-                'targetAttribute' => ['social_id' => 'id']
+                'targetAttribute' => [ 'social_id' => 'id' ]
             ],
         ];
     }

models/Setting.php

Spacing +14 added lines, -14 removed lines

@@ -109,7 +109,7 @@ 
      */
     public function getSettings()
     {
-        $result = $this->db->createCommand('SELECT * FROM ' . $this->tableName)
+        $result = $this->db->createCommand('SELECT * FROM '.$this->tableName)
             ->queryOne();
 
         $this->setAttributes($result, false);
@@ -128,14 +128,14 @@ 
             return false;
         }
 
-        $count = (int)$this->db->createCommand('SELECT COUNT(*) FROM ' . $this->tableName)->queryScalar();
+        $count = (int)$this->db->createCommand('SELECT COUNT(*) FROM '.$this->tableName)->queryScalar();
 
         if ($count > 0) {
-            $result = $this->db->createCommand('UPDATE ' . $this->tableName. ' SET ' . $this->queryUpdateAttributes())
+            $result = $this->db->createCommand('UPDATE '.$this->tableName.' SET '.$this->queryUpdateAttributes())
                 ->bindValues($this->attributesToBind())
                 ->execute();
         } else {
-            $result = $this->db->createCommand('INSERT INTO ' . $this->tableName. ' ' . $this->queryInsertAttributes())
+            $result = $this->db->createCommand('INSERT INTO '.$this->tableName.' '.$this->queryInsertAttributes())
                 ->bindValues($this->attributesToBind())
                 ->execute();
         }
@@ -152,10 +152,10 @@ 
      */
     private function attributesToBind(): array
     {
-        $attributesToBind = [];
+        $attributesToBind = [ ];
 
         foreach ($this->getAttributes() as $name => $value) {
-            $attributesToBind[':' . $name] = $value;
+            $attributesToBind[ ':'.$name ] = $value;
         }
 
         return $attributesToBind;
@@ -166,10 +166,10 @@ 
      */
     private function queryUpdateAttributes(): string
     {
-        $toUpdateArray = [];
+        $toUpdateArray = [ ];
 
         foreach ($this->getAttributes() as $name => $value) {
-            $toUpdateArray[] = $name . ' = :' . $name;
+            $toUpdateArray[ ] = $name.' = :'.$name;
         }
 
         return implode(', ', $toUpdateArray);
@@ -180,16 +180,16 @@ 
      */
     private function queryInsertAttributes(): string
     {
-        $toInsertArrayNames = [];
-        $toInsertArrayValues = [];
+        $toInsertArrayNames = [ ];
+        $toInsertArrayValues = [ ];
 
         foreach ($this->getAttributes() as $name => $value) {
-            $toInsertArrayNames[] = $name;
-            $toInsertArrayValues[] = ':' . $name;
+            $toInsertArrayNames[ ] = $name;
+            $toInsertArrayValues[ ] = ':'.$name;
         }
 
         return
-            ' (' . implode(', ', $toInsertArrayNames) . ') VALUES ' .
-            ' (' . implode(', ', $toInsertArrayValues) . ') ';
+            ' ('.implode(', ', $toInsertArrayNames).') VALUES '.
+            ' ('.implode(', ', $toInsertArrayValues).') ';
     }
 }

models/Social.php

Spacing +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
      */
     public function afterSave($insert, $changedAttributes)
     {
-        $this->linkWithContacts(empty($this->contacts) ? [] : $this->contacts);
+        $this->linkWithContacts(empty($this->contacts) ? [ ] : $this->contacts);
 
         parent::afterSave($insert, $changedAttributes);
     }

models/RegForm.php

Spacing +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
      *
      * @return array
      */
-    public function attributeLabels(){
+    public function attributeLabels() {
 
         return[
             'first_name' => 'First name',

models/UserValidate.php

Spacing +5 added lines, -5 removed lines

@@ -125,7 +125,7 @@ 
                 'unique',
                 'skipOnError'     => true,
                 'targetClass'     => \Yii::$app->user->identityClass,
-                'targetAttribute' => ['login' => 'login'],
+                'targetAttribute' => [ 'login' => 'login' ],
                 'filter' => $this->getScenario() == self::SCENARIO_UPDATE ? 'id != '.$this->id : ''
             ],
             [
@@ -133,7 +133,7 @@ 
                 'unique',
                 'skipOnError'     => true,
                 'targetClass'     => \Yii::$app->user->identityClass,
-                'targetAttribute' => ['email' => 'email'],
+                'targetAttribute' => [ 'email' => 'email' ],
                 'filter' => $this->getScenario() == self::SCENARIO_UPDATE ? 'id != '.$this->id : ''
             ],
             [
@@ -166,7 +166,7 @@ 
                 'exist',
                 'skipOnError' => true,
                 'targetClass' => Position::class,
-                'targetAttribute' => ['position_id' => 'id']
+                'targetAttribute' => [ 'position_id' => 'id' ]
             ],
         ];
     }
@@ -244,7 +244,7 @@ 
      */
     public function __get($name)
     {
-        $getter = 'get' . $name;
+        $getter = 'get'.$name;
 
         if (method_exists($this, $getter)) {
             return $this->$getter();
@@ -267,7 +267,7 @@ 
      */
     public function __set($name, $value)
     {
-        $setter = 'set' . $name;
+        $setter = 'set'.$name;
 
         if (method_exists($this, $setter)) {
             $this->$setter($value);

views/layouts/base.php

Spacing +36 added lines, -36 removed lines

@@ -6,8 +6,8 @@ 
 use app\models\Contact;
 use Itstructure\MultiLevelMenu\MenuWidget;
 
-$contacts = $this->params['contacts'];
-$controllerId = $this->params['controllerId'];
+$contacts = $this->params[ 'contacts' ];
+$controllerId = $this->params[ 'controllerId' ];
 
 /* @var \yii\web\View $this */
 /* @var string $content */
@@ -44,49 +44,49 @@ 
     ]); ?>
 
     <ul class="nav navbar-nav navbar-right">
-        <li class="nav-item <?php if($controllerId=='home'): ?>active<?php endif; ?>">
-            <a class="nav-link" href="/<?php echo $this->params['shortLanguage']; ?>"><?php echo Yii::t('app', 'Home') ?></a>
+        <li class="nav-item <?php if ($controllerId == 'home'): ?>active<?php endif; ?>">
+            <a class="nav-link" href="/<?php echo $this->params[ 'shortLanguage' ]; ?>"><?php echo Yii::t('app', 'Home') ?></a>
         </li>
-        <li class="nav-item <?php if($controllerId=='about'): ?>active<?php endif; ?>">
-            <a class="nav-link" href="/<?php echo $this->params['shortLanguage']; ?>/about"><?php echo Yii::t('about', 'About') ?></a>
+        <li class="nav-item <?php if ($controllerId == 'about'): ?>active<?php endif; ?>">
+            <a class="nav-link" href="/<?php echo $this->params[ 'shortLanguage' ]; ?>/about"><?php echo Yii::t('about', 'About') ?></a>
         </li>
-        <li class="nav-item dropdown <?php if($controllerId=='page'): ?>active<?php endif; ?>">
+        <li class="nav-item dropdown <?php if ($controllerId == 'page'): ?>active<?php endif; ?>">
             <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 <?php echo Yii::t('pages', 'Pages') ?>
             </a>
             <?php echo MenuWidget::widget([
-                'data' => $this->params['pages'],
+                'data' => $this->params[ 'pages' ],
                 'itemTemplate' => '@app/views/menu/pageItem.php',
-                'itemTemplateParams' => function ($level, $item) {
+                'itemTemplateParams' => function($level, $item) {
                     return [
-                        'shortLanguage' => $this->params['shortLanguage'],
-                        'linkOptions' => isset($item['items']) && count($item['items']) > 0 ? [
+                        'shortLanguage' => $this->params[ 'shortLanguage' ],
+                        'linkOptions' => isset($item[ 'items' ]) && count($item[ 'items' ]) > 0 ? [
                             'class' => 'dropdown-toggle',
                             'data-toggle' => 'dropdown',
                             'aria-haspopup' => 'true',
                             'aria-expanded' => 'false',
-                        ] : [],
+                        ] : [ ],
                     ];
                 },
                 'mainContainerOptions' => [
                     'class' => 'dropdown-menu'
                 ],
-                'itemContainerOptions' => function ($level, $item) {
+                'itemContainerOptions' => function($level, $item) {
                     return [
-                        'class' => isset($item['items']) && count($item['items']) > 0 ? 'dropdown-item dropdown' : 'dropdown-item'
+                        'class' => isset($item[ 'items' ]) && count($item[ 'items' ]) > 0 ? 'dropdown-item dropdown' : 'dropdown-item'
                     ];
                 }
             ]) ?>
         </li>
-        <li class="nav-item <?php if($controllerId=='contact'): ?>active<?php endif; ?>">
-            <a class="nav-link" href="/<?php echo $this->params['shortLanguage']; ?>/contact" ><?php echo Yii::t('contacts', 'Contacts') ?></a>
+        <li class="nav-item <?php if ($controllerId == 'contact'): ?>active<?php endif; ?>">
+            <a class="nav-link" href="/<?php echo $this->params[ 'shortLanguage' ]; ?>/contact" ><?php echo Yii::t('contacts', 'Contacts') ?></a>
         </li>
         <li class="nav-item dropdown">
             <a href="#" class="nav-link dropdown-toggle" id="dropdown_languages" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 <?php echo Yii::t('site', 'Languages') ?>
             </a>
             <?php echo MenuWidget::widget([
-                'data' => $this->params['languages'],
+                'data' => $this->params[ 'languages' ],
                 'itemTemplate' => '@app/views/menu/languageItem.php',
                 'mainContainerOptions' => [
                     'class' => 'dropdown-menu',
@@ -104,10 +104,10 @@ 
                 </a>
                 <ul class="dropdown-menu">
                     <li class="dropdown-item">
-                        <a href="/<?php echo $this->params['shortLanguage']; ?>/reg" ><?php echo Yii::t('site', 'Register') ?></a>
+                        <a href="/<?php echo $this->params[ 'shortLanguage' ]; ?>/reg" ><?php echo Yii::t('site', 'Register') ?></a>
                     </li>
                     <li class="dropdown-item">
-                        <a href="/<?php echo $this->params['shortLanguage']; ?>/login" ><?php echo Yii::t('site', 'Login') ?></a>
+                        <a href="/<?php echo $this->params[ 'shortLanguage' ]; ?>/login" ><?php echo Yii::t('site', 'Login') ?></a>
                     </li>
                 </ul>
             </li>
@@ -118,10 +118,10 @@ 
                 </a>
                 <ul class="dropdown-menu">
                     <li class="dropdown-item">
-                        <a href="/<?php echo $this->params['shortLanguage']; ?>/admin" ><?php echo Yii::t('site', 'Dashboard') ?></a>
+                        <a href="/<?php echo $this->params[ 'shortLanguage' ]; ?>/admin" ><?php echo Yii::t('site', 'Dashboard') ?></a>
                     </li>
                     <li class="dropdown-item">
-                        <a href="/<?php echo $this->params['shortLanguage']; ?>/logout" ><?php echo Yii::t('site', 'Sign out') ?></a>
+                        <a href="/<?php echo $this->params[ 'shortLanguage' ]; ?>/logout" ><?php echo Yii::t('site', 'Sign out') ?></a>
                     </li>
                 </ul>
             </li>
@@ -131,7 +131,7 @@ 
     <?php NavBar::end(); ?>
 
     <div class="container">
-        <?php if (isset($this->params['breadcrumbs'])): ?>
+        <?php if (isset($this->params[ 'breadcrumbs' ])): ?>
             <section class="full_width breadcrumbs_block clearfix">
                 <div class="container">
                     <div class="breadcrumbs_content">
@@ -141,10 +141,10 @@ 
                             'options' => [
                                 'class' => 'pull-right breadcrumb'
                             ],
-                            'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
+                            'links' => isset($this->params[ 'breadcrumbs' ]) ? $this->params[ 'breadcrumbs' ] : [ ],
                             'homeLink' => [
                                 'label' => Yii::t('yii', 'Home'),
-                                'url' => rtrim(Yii::$app->homeUrl, '/') . '/' . $this->params['shortLanguage'],
+                                'url' => rtrim(Yii::$app->homeUrl, '/').'/'.$this->params[ 'shortLanguage' ],
                             ]
                         ]) ?>
                     </div>
@@ -163,27 +163,27 @@ 
         <div class="row" data-animated="fadeInUp">
             <div class="col-lg-7 col-md-8 col-sm-8 padbot30">
                 <ul class="foot_menu">
-                    <li <?php if($controllerId=='home'): ?>class="active"<?php endif; ?> >
-                        <a href="/<?php echo $this->params['shortLanguage']; ?>" alt=""><?php echo Yii::t('app', 'Home') ?></a>
+                    <li <?php if ($controllerId == 'home'): ?>class="active"<?php endif; ?> >
+                        <a href="/<?php echo $this->params[ 'shortLanguage' ]; ?>" alt=""><?php echo Yii::t('app', 'Home') ?></a>
                     </li>
-                    <li <?php if($controllerId=='about'): ?>class="active"<?php endif; ?> >
-                        <a href="/<?php echo $this->params['shortLanguage']; ?>/about" ><?php echo Yii::t('about', 'About me') ?></a>
+                    <li <?php if ($controllerId == 'about'): ?>class="active"<?php endif; ?> >
+                        <a href="/<?php echo $this->params[ 'shortLanguage' ]; ?>/about" ><?php echo Yii::t('about', 'About me') ?></a>
                     </li>
-                    <li <?php if($controllerId=='contact'): ?>class="active"<?php endif; ?> >
-                        <a href="/<?php echo $this->params['shortLanguage']; ?>/contact" ><?php echo Yii::t('contacts', 'Contacts') ?></a>
+                    <li <?php if ($controllerId == 'contact'): ?>class="active"<?php endif; ?> >
+                        <a href="/<?php echo $this->params[ 'shortLanguage' ]; ?>/contact" ><?php echo Yii::t('contacts', 'Contacts') ?></a>
                     </li>
                 </ul>
                 <hr>
                 <?php if (null !== $contacts): ?>
                     <ul class="foot_info">
-                        <?php if (!empty($contacts->{'address_'.$this->params['shortLanguage']})): ?>
-                            <li><i class="fa fa-home"></i><?php echo $contacts->{'address_'.$this->params['shortLanguage']} ?></li>
+                        <?php if (!empty($contacts->{'address_'.$this->params[ 'shortLanguage' ]})): ?>
+                            <li><i class="fa fa-home"></i><?php echo $contacts->{'address_'.$this->params[ 'shortLanguage' ]} ?></li>
                         <?php endif; ?>
-                        <?php if (!empty($contacts->{'phone_'.$this->params['shortLanguage']})): ?>
-                            <li><i class="fa fa-phone"></i><?php echo $contacts->{'phone_'.$this->params['shortLanguage']} ?></li>
+                        <?php if (!empty($contacts->{'phone_'.$this->params[ 'shortLanguage' ]})): ?>
+                            <li><i class="fa fa-phone"></i><?php echo $contacts->{'phone_'.$this->params[ 'shortLanguage' ]} ?></li>
                         <?php endif; ?>
-                        <?php if (!empty($contacts->{'email_'.$this->params['shortLanguage']})): ?>
-                            <li><i class="fa fa-envelope-o"></i><a href="mailto:<?php echo $contacts->{'email_'.$this->params['shortLanguage']} ?>"><?php echo $contacts->{'email_'.$this->params['shortLanguage']} ?></a></li>
+                        <?php if (!empty($contacts->{'email_'.$this->params[ 'shortLanguage' ]})): ?>
+                            <li><i class="fa fa-envelope-o"></i><a href="mailto:<?php echo $contacts->{'email_'.$this->params[ 'shortLanguage' ]} ?>"><?php echo $contacts->{'email_'.$this->params[ 'shortLanguage' ]} ?></a></li>
                         <?php endif; ?>
                     </ul>
                 <?php endif; ?>

Braces +5 added lines, -2 removed lines

@@ -111,14 +111,17 @@
                     </li>
                 </ul>
             </li>
-        <?php else: ?>
+        <?php else {
+    : ?>
             <li class="nav-item dropdown">
                 <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     <?php echo Yii::t('site', 'Account') ?>
                 </a>
                 <ul class="dropdown-menu">
                     <li class="dropdown-item">
-                        <a href="/<?php echo $this->params['shortLanguage']; ?>/admin" ><?php echo Yii::t('site', 'Dashboard') ?></a>
+                        <a href="/<?php echo $this->params['shortLanguage'];
+}
+?>/admin" ><?php echo Yii::t('site', 'Dashboard') ?></a>
                     </li>
                     <li class="dropdown-item">
                         <a href="/<?php echo $this->params['shortLanguage']; ?>/logout" ><?php echo Yii::t('site', 'Sign out') ?></a>

views/product/view.php

Spacing +3 added lines, -3 removed lines

@@ -3,17 +3,17 @@
 
 /* @var Product $model */
 
-$this->params['breadcrumbs'][] = $model->{'title_'.$this->params['shortLanguage']};
+$this->params[ 'breadcrumbs' ][ ] = $model->{'title_'.$this->params[ 'shortLanguage' ]};
 ?>
 
-<?php if (!empty($model->{'content_'.$this->params['shortLanguage']})): ?>
+<?php if (!empty($model->{'content_'.$this->params[ 'shortLanguage' ]})): ?>
     <section class="inform_block">
 
         <div class="container">
 
             <div class="row" data-animated="fadeIn">
                 <div class="col-lg-12 col-md-12 col-sm-10">
-                    <?php echo $model->{'content_'.$this->params['shortLanguage']} ?>
+                    <?php echo $model->{'content_'.$this->params[ 'shortLanguage' ]} ?>
                 </div>
             </div>
         </div>

views/about/index.php

Spacing +2 added lines, -2 removed lines

@@ -3,14 +3,14 @@
 
 /* @var $model About */
 
-$this->params['breadcrumbs'][] = $model->{'title_'.$this->params['shortLanguage']};
+$this->params[ 'breadcrumbs' ][ ] = $model->{'title_'.$this->params[ 'shortLanguage' ]};
 ?>
 
 <section class="inform_block">
     <div class="container">
         <div class="row" data-animated="fadeIn">
             <div class="col-lg-12 col-md-12 col-sm-10">
-                <?php echo $model->{'content_'.$this->params['shortLanguage']} ?>
+                <?php echo $model->{'content_'.$this->params[ 'shortLanguage' ]} ?>
             </div>
         </div>
     </div>