TonisOrmisson / yii2-myabstract

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) {
         /** @var static $model */
         $model = static::find()
             ->andWhere([$this->keyColumn => $key])

src/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>

src/myTemplates/crud/default/controller.php

Spacing +4 added lines, -4 removed lines

@@ -33,9 +33,9 @@ 
 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 +97,7 @@ 
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
         ]);
-<?php else: ?>
+<?php else : ?>
         $dataProvider = new ActiveDataProvider([
             'query' => <?= $modelClass ?>::find(),
         ]);
@@ -105,7 +105,7 @@ 
         return $this->render('index', [
             'dataProvider' => $dataProvider,
         ]);
-<?php endif;?>
+<?php endif; ?>
     }
 
     /**

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 +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
                     /** @var Setting $setting */
                     $setting = new $this->itemClass;
 
-                    if (! $setting->findOneByKey($checkAttribute)) {
+                    if (!$setting->findOneByKey($checkAttribute)) {
                         throw new yii\base\InvalidConfigException('Key "' . $checkAttribute . '" is missing in ' . $this->itemClass);
                     }
                 }

Indentation +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 
         $this->setSettings();
         if (!is_null($this->typeClass)) {
-           $this->loadStrings();
+            $this->loadStrings();
         }
     }
 

src/test/ModelTestTrait.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     public function testRulesForExistingAttributesOnly() {
         // labels only for actually existing attributes
         foreach ($this->model->rules() as $rule) {
-            $rules = (is_array($rule[0]) ? $rule[0] : [$rule[0]] );
+            $rules = (is_array($rule[0]) ? $rule[0] : [$rule[0]]);
             foreach ($rules as $attribute) {
                 $this->assertArrayHasKey($attribute, array_merge(get_object_vars($this->model), $this->model->attributes));
             }

src/myTemplates/crud/admin/controller.php

Spacing +2 added lines, -2 removed lines

@@ -32,9 +32,9 @@
 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, '\\') ?>;
 
 /**

Braces +5 added lines, -2 removed lines

@@ -32,9 +32,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, '\\') ?>;
 
 /**

src/myTemplates/crud/admin/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>

src/traits/MyActiveTrait.php

Spacing +2 added lines, -2 removed lines

@@ -313,7 +313,7 @@ 
      */
     private function lastClosingTime($tableName) {
         $cacheKey = "closing:time:{$tableName}";
-        return Yii::$app->cache->getOrSet($cacheKey, function () use ($tableName) {
+        return Yii::$app->cache->getOrSet($cacheKey, function() use ($tableName) {
             $dateHelper = new DateHelper();
 
             if (!$this->hasClosing($tableName)) {
@@ -335,7 +335,7 @@ 
     private function hasClosing($tableName)
     {
         $cacheKey = "closing:has:{$tableName}";
-        return Yii::$app->cache->getOrSet($cacheKey, function () use ($tableName) {
+        return Yii::$app->cache->getOrSet($cacheKey, function() use ($tableName) {
             $closing = Closing::findOne($tableName);
             return !($closing == null);
         });

src/traits/ConsoleAwareTrait.php

Indentation -1 removed lines

@@ -7,7 +7,6 @@
 /**
  * Class ConsoleAwareTrait
  * @package andmemasin\myabstract\traits
-
  * @property boolean $isConsole whether we currently run in console app or not
  *
  */