TonisOrmisson / yii2-myabstract

traits/MyActiveTrait.php

Indentation +2 added lines, -2 removed lines

@@ -300,8 +300,8 @@
      * @return bool
      */
     private static function hasClosing($tableName){
-         $closing = Closing::findOne($tableName);
-         return !($closing == null);
+            $closing = Closing::findOne($tableName);
+            return !($closing == null);
     }
 
     /**

Braces +6 added lines, -6 removed lines

@@ -48,7 +48,7 @@ 
         // if there is no user Id, we use the default ID 1
         if(!isset(Yii::$app->user) || empty(Yii::$app->user->identity)){
             $userId = 1;
-        }else{
+        } else{
             $userId = Yii::$app->user->identity->getId();
         }
         if ($this->isNewRecord){
@@ -115,11 +115,11 @@ 
                 self::updateClosingTime(parent::tableName());
                 $this->afterDelete();
                 return true;
-            }else {
+            } else {
                 throw new yii\base\UserException('Error deleting model');
             }
 
-        }else{
+        } else{
             // otherwise regular delete
             parent::delete();
             return true;
@@ -150,7 +150,7 @@ 
                         $row[$key] = $value;
                     }
                     $rows[]=$row;
-                }  else {
+                } else {
                     throw new InvalidParamException('Missing object attributes in '. get_called_class().' '.__FUNCTION__);
                 }
 
@@ -189,7 +189,7 @@ 
             \Yii::$app->db->createCommand()->update(parent::tableName(), $baseParams,$conditions)->execute();
             self::updateClosingTime(static::tableName());
 
-        }else{
+        } else{
             throw new yii\base\InvalidArgumentException('No conditions defined for '. get_called_class().' '.__FUNCTION__);
         }
 
@@ -272,7 +272,7 @@ 
         }
         if($newModel->save()){
             return $newModel;
-        }else{
+        } else{
             throw new yii\base\UserException('Error copying model');
         }
     }

traits/ModelWithHasStatusTrait.php

Braces +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
                 $this->addStatus(StatusModel::STATUS_CREATED);
             }
             $this->addStatus($this->status);
-        }else{
+        } else{
             if(isset($changedAttributes['status'])){
                 $this->addStatus($this->status);
             }

MyAssignment.php

Braces +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
 
                 if(!$this->childExists($childId)){
                     $model = new $this->assignmentClassname;
-                }else{
+                } else{
                     $model = $this->getCurrentChildById($childId);
                 }
 

myTemplates/crud/default/views/index.php

Braces +5 added lines, -2 removed lines

@@ -69,7 +69,8 @@ 
                 ['class' => 'yii\grid\ActionColumn'],
                 ],
                 ]); ?>
-            <?php else: ?>
+            <?php else {
+    : ?>
                 <?= "<?= " ?>ListView::widget([
                 'dataProvider' => $dataProvider,
                 'itemOptions' => ['class' => 'item'],
@@ -77,7 +78,9 @@ 
                 return Html::a(Html::encode($model-><?= $nameAttribute ?>), ['view', <?= $urlParams ?>]);
                 },
                 ]) ?>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
 
         </div>
     </div>

myTemplates/crud/default/controller.php

Braces +10 added lines, -4 removed lines

@@ -33,9 +33,12 @@ 
 use <?= ltrim($generator->modelClass, '\\') ?>;
 <?php if (!empty($generator->searchModelClass)): ?>
 use <?= ltrim($generator->searchModelClass, '\\') . (isset($searchModelAlias) ? " as $searchModelAlias" : "") ?>;
-<?php else: ?>
+<?php else {
+    : ?>
 use yii\data\ActiveDataProvider;
-<?php endif; ?>
+<?php endif;
+}
+?>
 use <?= ltrim($generator->baseControllerClass, '\\') ?>;
 use yii\web\NotFoundHttpException;
 use yii\web\ForbiddenHttpException;
@@ -97,7 +100,8 @@ 
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
         ]);
-<?php else: ?>
+<?php else {
+    : ?>
         $dataProvider = new ActiveDataProvider([
             'query' => <?= $modelClass ?>::find(),
         ]);
@@ -105,7 +109,9 @@ 
         return $this->render('index', [
             'dataProvider' => $dataProvider,
         ]);
-<?php endif; ?>
+<?php endif;
+}
+?>
     }
 
     /**