andmemasin / language

views/language/update.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 $this->title = Yii::t('app', 'Update {modelClass}: ', [
     'modelClass' => 'Language',
-]) . ' ' . $model->name;
+]).' '.$model->name;
 $this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Languages'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'language_id' => $model->primaryKey]];
 $this->params['breadcrumbs'][] = Yii::t('app', 'Update');

migrations/m180328_085629_add_indexes.php

Spacing +6 added lines, -6 removed lines

@@ -16,13 +16,13 @@ 
         $this->tableName = $model;
 
         if ($model === 'language') {
-            $this->columns =[
+            $this->columns = [
                 'language', 'name'
             ];
         }
 
         if ($model === 'language_translation') {
-            $this->columns =[
+            $this->columns = [
                 'model_class', 'model_field_name', 'model_id'
             ];
         }
@@ -53,15 +53,15 @@ 
 
 
 
-    private function createIndexes(){
+    private function createIndexes() {
         foreach ($this->columns as $column) {
-            $this->createIndex($this->indexPrefix.$column,$this->tableName, $column);
+            $this->createIndex($this->indexPrefix.$column, $this->tableName, $column);
         }
     }
 
-    private function dropIndexes(){
+    private function dropIndexes() {
         foreach ($this->columns as $column) {
-            $this->dropIndex($this->indexPrefix.$column,$this->tableName);
+            $this->dropIndex($this->indexPrefix.$column, $this->tableName);
         }
     }
 

migrations/m170424_075136_add_language_translate.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
     public $tableName = 'language_translation';
     public function safeUp()
     {
-        $this->createTable($this->tableName,[
+        $this->createTable($this->tableName, [
             'language_translation_id' => $this->primaryKey()->comment('ID'),
             'language_id' => $this->integer()->notNull()->comment('Language'),
             'model_class' => $this->string(255)->notNull()->comment('Translated model class name'),
@@ -15,7 +15,7 @@ 
             'model_id' => $this->integer()->notNull()->comment('Translated model ID'),
             'value' => $this->text()->notNull()->comment('Translated model class name'),
         ]);
-        $this->addForeignKey('fk_language_translation_language_id','language_translation','language_id','language','language_id');
+        $this->addForeignKey('fk_language_translation_language_id', 'language_translation', 'language_id', 'language', 'language_id');
 
     }
 

migrations/m160223_102646_add_language.php

Spacing +7 added lines, -7 removed lines

@@ -8,18 +8,18 @@
 
     public function safeUp()
     {
-        $this->createTable($this->tableName,[
+        $this->createTable($this->tableName, [
             'language_id' => $this->primaryKey()->comment('ID'),
             'language' => $this->string(16)->notNull()->comment('language code'),
             'name' => $this->string(255)->notNull()->comment('Language name'),
 
         ]);
-        $this->insert($this->tableName,['language_id'=>1, 'language'=>'en-US','name'=>'English']);
-        $this->insert($this->tableName,['language_id'=>2, 'language'=>'et','name'=>'Estonian']);
-        $this->insert($this->tableName,['language_id'=>3, 'language'=>'ru','name'=>'Russian']);
-        $this->insert($this->tableName,['language_id'=>4, 'language'=>'fi','name'=>'Finnish']);
-        $this->insert($this->tableName,['language_id'=>5, 'language'=>'lv','name'=>'Latvian']);
-        $this->insert($this->tableName,['language_id'=>6, 'language'=>'lt','name'=>'Lithuanian']);
+        $this->insert($this->tableName, ['language_id'=>1, 'language'=>'en-US', 'name'=>'English']);
+        $this->insert($this->tableName, ['language_id'=>2, 'language'=>'et', 'name'=>'Estonian']);
+        $this->insert($this->tableName, ['language_id'=>3, 'language'=>'ru', 'name'=>'Russian']);
+        $this->insert($this->tableName, ['language_id'=>4, 'language'=>'fi', 'name'=>'Finnish']);
+        $this->insert($this->tableName, ['language_id'=>5, 'language'=>'lv', 'name'=>'Latvian']);
+        $this->insert($this->tableName, ['language_id'=>6, 'language'=>'lt', 'name'=>'Lithuanian']);
 
     }
 

models/LanguageSearch.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     public function rules()
     {
         return [
-            [['language_id','language', 'name'], 'safe'],
+            [['language_id', 'language', 'name'], 'safe'],
         ];
     }
 

models/LanguageSettingsPack.php

Spacing +19 added lines, -19 removed lines

@@ -30,11 +30,11 @@ 
     {
         parent::init();
 
-        if(!$this->parent){
+        if (!$this->parent) {
             throw new yii\base\InvalidConfigException('Parent Model must be defined while initiating languages-settings');
         }
 
-        if(!$this->parent instanceof WithLanguagesInterface){
+        if (!$this->parent instanceof WithLanguagesInterface) {
             throw new yii\base\InvalidConfigException('Parent Model must implement WithLanguagesInterface');
         }
         $this->setLanguageSettings();
@@ -42,8 +42,8 @@ 
     }
 
     protected function setLanguageSettings() {
-        if(!empty($this->parent->languages)){
-            foreach ($this->parent->languages as $language){
+        if (!empty($this->parent->languages)) {
+            foreach ($this->parent->languages as $language) {
                 /* @var BaseLanguageSettings $languageSettings */
                 $languageSettings = Yii::createObject([
                     'class' => $this->languageSettingsClass,
@@ -55,11 +55,11 @@ 
         }
     }
 
-    public function save($runValidation = true,$attributeNames=null){
-        if(!empty($this->languageSettings)){
+    public function save($runValidation = true, $attributeNames = null) {
+        if (!empty($this->languageSettings)) {
             // language by language
-            foreach ($this->languageSettings as $key => $languageSetting){
-                $languageSetting->save($runValidation,$attributeNames);
+            foreach ($this->languageSettings as $key => $languageSetting) {
+                $languageSetting->save($runValidation, $attributeNames);
                 $this->addErrors($languageSetting->errors);
                 $this->languageSettings[$key] = $languageSetting;
             }
@@ -75,9 +75,9 @@ 
      * @param string $key
      * @return bool|string
      */
-    public function getSettingByLanguageAndKey($language, $key){
+    public function getSettingByLanguageAndKey($language, $key) {
         $setting = $this->getSettingByKeyAndLanguage($language, $key);
-        if(!$setting){
+        if (!$setting) {
             $setting = $this->getSettingByKeyInAnyLanguage($key);
         }
         return $setting;
@@ -90,10 +90,10 @@ 
      * @param string $key
      * @return bool|string
      */
-    public function getSettingByKeyAndLanguage($language, $key){
-        if(isset($this->languageSettings[$language->primaryKey])){
+    public function getSettingByKeyAndLanguage($language, $key) {
+        if (isset($this->languageSettings[$language->primaryKey])) {
             $languageSettings = $this->languageSettings[$language->primaryKey];
-            if($languageSettings->{$key} && $languageSettings->{$key} != ''){
+            if ($languageSettings->{$key} && $languageSettings->{$key} != '') {
                 return $languageSettings->{$key};
             }
         }
@@ -107,10 +107,10 @@ 
      * @param string $key
      * @return bool|string
      */
-    public function getSettingByKeyInAnyLanguage($key){
-        if(!empty($this->languageSettings)){
-            foreach ($this->languageSettings as $language_id => $languageSettings){
-                if($languageSettings->{$key} && $languageSettings->{$key} != ''){
+    public function getSettingByKeyInAnyLanguage($key) {
+        if (!empty($this->languageSettings)) {
+            foreach ($this->languageSettings as $language_id => $languageSettings) {
+                if ($languageSettings->{$key} && $languageSettings->{$key} != '') {
                     return $languageSettings->{$key};
                 }
             }
@@ -125,10 +125,10 @@ 
     {
         $scope = yii\helpers\StringHelper::basename($this->languageSettingsClass);
         if (isset($data[$scope])) {
-            foreach ($data[$scope] as $language_id => $attributes){
+            foreach ($data[$scope] as $language_id => $attributes) {
                 $language = Language::findOne($language_id);
                 /** @var BaseLanguageSettings $model */
-                if(isset($this->languageSettings[$language_id])){
+                if (isset($this->languageSettings[$language_id])) {
                     $model = $this->languageSettings[$language_id];
                 } else {
                     $model = Yii::createObject([

models/BaseLanguageSetting.php

Spacing +14 added lines, -14 removed lines

@@ -21,7 +21,7 @@ 
 class BaseLanguageSetting extends MyActiveRecord implements  SettingInterface {
 
     /** @var string $typeColumn the column containing setting type id */
-    protected static $typeColumn  = "key";
+    protected static $typeColumn = "key";
     /** @var string  */
     public $keyColumn = "key";
 
@@ -36,11 +36,11 @@ 
     public function init()
     {
         parent::init();
-        if($this->insert()){
-            if(!$this->parent){
+        if ($this->insert()) {
+            if (!$this->parent) {
                 throw new InvalidConfigException('Parent Model must be defined while initiating languages-settings');
             }
-            if(!$this->parent instanceof WithLanguageInterface){
+            if (!$this->parent instanceof WithLanguageInterface) {
                 throw new InvalidConfigException('Parent Model must implement ModelWithLanguages');
             }
 
@@ -57,7 +57,7 @@ 
             [['language_id', 'value'], 'required'],
             [['value'], 'string'],
             [['language_id'], 'exist', 'skipOnError' => true, 'targetClass' => Language::class, 'targetAttribute' => ['language_id' => 'language_id']],
-        ],  parent::rules());
+        ], parent::rules());
     }
 
     /**
@@ -66,37 +66,37 @@ 
      * @param string $key
      * @return bool|static|array
      */
-    public static function getSetting($parent, $language, $key){
+    public static function getSetting($parent, $language, $key) {
 
         /** @var TypeInterface $typeClass */
         $typeClass = static::$typeClass;
         /** @var TypeInterface $type */
         $type = $typeClass::getByKey($key);
 
-        if(!empty($type)){
+        if (!empty($type)) {
             /** @var BaseLanguageSetting $model */
             $query = static::find();
-            if(!empty($parent)){
+            if (!empty($parent)) {
                 $query->andWhere([$parent->primaryKeySingle() =>$parent->primaryKey]);
             }
-            $model =$query->andWhere(['language_id'=>$language->primaryKey])
+            $model = $query->andWhere(['language_id'=>$language->primaryKey])
                 ->andWhere([$type->primaryKeySingle()=>$type->{$type->primaryKeySingle()}])
                 ->one();
 
-            if(empty($model)){
+            if (empty($model)) {
                 /** @var BaseLanguageSetting $model */
                 $model = \Yii::createObject(['class'=>static::class]);
                 $model->language_id = $language->primaryKey;
-                if(!empty($parent)){
+                if (!empty($parent)) {
                     $model->{$parent->primaryKeySingle()} = $parent->primaryKey;
                 }
-                $model->{$type->primaryKeySingle()}=$type->{$type->primaryKeySingle()};
+                $model->{$type->primaryKeySingle()} = $type->{$type->primaryKeySingle()};
 
             }
             return $model;
         }
 
-        throw new InvalidConfigException('Undefined type key: ' . $key);
+        throw new InvalidConfigException('Undefined type key: '.$key);
 
     }
 
@@ -136,7 +136,7 @@ 
      * @param $key string
      * @return static
      */
-    public function findOneByKey($key){
+    public function findOneByKey($key) {
         /** @var static $model */
         $model = static::find()
             ->andWhere([static::$typeColumn => $key])

models/BaseLanguageSettings.php

Spacing +4 added lines, -4 removed lines

@@ -48,12 +48,12 @@
     }
 
     /** {@inheritdoc} */
-    public function save($runValidation = true, $attributeNames = NULL){
-        if(!empty($this->settings)){
+    public function save($runValidation = true, $attributeNames = NULL) {
+        if (!empty($this->settings)) {
             foreach ($this->settings as $key => $setting) {
                 // delete empty
-                if($setting->value === null || $setting->value === ''){
-                    if(!$setting->isNewRecord){
+                if ($setting->value === null || $setting->value === '') {
+                    if (!$setting->isNewRecord) {
                         $setting->delete();
                     }
                 } else {

models/ModelWithLanguageSettings.php

Spacing +4 added lines, -4 removed lines

@@ -36,12 +36,12 @@ 
         parent::load($data, $formName = null);
         $scope = \yii\helpers\StringHelper::basename($this->languageSettingsPack->languageSettingsClass);
         if (isset($data[$scope])) {
-            foreach ($data[$scope] as $language_id => $attributes){
+            foreach ($data[$scope] as $language_id => $attributes) {
                 $language = Language::findOne($language_id);
                 /** @var BaseLanguageSettings $model */
-                if(isset($this->languageSettingsPack->languageSettings[$language_id])){
+                if (isset($this->languageSettingsPack->languageSettings[$language_id])) {
                     $model = $this->languageSettingsPack->languageSettings[$language_id];
-                }else{
+                } else {
                     $model = Yii::createObject([
                         'class' => $this->languageSettingsPack->languageSettingsClass,
                         'language'=>$language,
@@ -62,7 +62,7 @@ 
 
 
     /** {@inheritdoc} */
-    public function save(){
+    public function save() {
         parent::save();
         $this->languageSettingsPack->save();
         $this->addErrors($this->languageSettingsPack->errors);

Braces +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
                 /** @var BaseLanguageSettings $model */
                 if(isset($this->languageSettingsPack->languageSettings[$language_id])){
                     $model = $this->languageSettingsPack->languageSettings[$language_id];
-                }else{
+                } else{
                     $model = Yii::createObject([
                         'class' => $this->languageSettingsPack->languageSettingsClass,
                         'language'=>$language,