TonisOrmisson / yii2-myabstract

src/myTemplates/crud/default/views/index.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
                 return Html::a(Html::encode($model-><?= $nameAttribute ?>), ['view', <?= $urlParams ?>]);
                 },
                 ]) ?>
-            <?php endif;?>
+            <?php endif; ?>
 
         </div>
     </div>

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>

src/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;
+}
+?>
     }
 
     /**

src/Settings.php

Spacing +6 added lines, -6 removed lines

@@ -95,15 +95,15 @@ 
 
 
     /** {@inheritdoc} */
-    public function setSettings(){
+    public function setSettings() {
         // get existing settings
 
         /** @var Setting $settingClass */
         $settingClass = $this->itemClass;
         $query = $settingClass::find();
         $settings = $query->all();
-        if(!empty($settings)){
-            foreach ($settings as $setting){
+        if (!empty($settings)) {
+            foreach ($settings as $setting) {
                 if (in_array($setting->key, array_keys($this->attributes))) {
                     $this->settings[$setting->key] = $setting;
                     $this->{$setting->key} = $setting->value;
@@ -126,9 +126,9 @@ 
     }
 
     /** {@inheritdoc} */
-    public function save(){
-        if(!empty($this->settings)){
-            foreach ($this->settings as $key=> $setting){
+    public function save() {
+        if (!empty($this->settings)) {
+            foreach ($this->settings as $key=> $setting) {
                 if (in_array($setting->key, array_keys($this->attributes))) {
                     $setting->save();
                     $this->settings[$key] = $setting;

src/Setting.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
      * @param $key string
      * @return static
      */
-    public function findOneByKey($key){
+    public function findOneByKey($key) {
         $model = static::find()
             ->andWhere([$this->keyColumn => $key])
             ->one();

src/traits/MyActiveTrait.php

Spacing +3 added lines, -3 removed lines

@@ -128,10 +128,10 @@ 
 
             // delete logically
             if ($this->userUpdatedCol) {
-                $this->{$this->userUpdatedCol} = $this->getIdentityId();;
+                $this->{$this->userUpdatedCol} = $this->getIdentityId(); ;
             }
             if ($this->userClosedCol) {
-                $this->{$this->userClosedCol} = $this->getIdentityId();;
+                $this->{$this->userClosedCol} = $this->getIdentityId(); ;
             }
 
             if ($this->timeUpdatedCol) {
@@ -332,7 +332,7 @@ 
      * @param string $tableName
      * @return bool
      */
-    private static function hasClosing($tableName){
+    private static function hasClosing($tableName) {
             $closing = Closing::findOne($tableName);
             return !($closing == null);
     }