TonisOrmisson / yii2-myabstract

MyAssignment.php

Spacing +41 added lines, -41 removed lines

@@ -80,13 +80,13 @@ 
     {
         $this->on(self::EVENT_BEFORE_ITEM_SAVE, [$this, 'beforeItemSave']);
 
-        if(!$this->parent){
-            throw new yii\base\InvalidArgumentException('Parent not defined in '.self::class);
+        if (!$this->parent) {
+            throw new yii\base\InvalidArgumentException('Parent not defined in ' . self::class);
         }
 
         $this->setCurrentChildren();
         $this->itemsOrder = "";
-        $this->assignmentClassname =  $this->assignment->class;
+        $this->assignmentClassname = $this->assignment->class;
         parent::init();
     }
 
@@ -94,17 +94,17 @@ 
     public function rules()
     {
         return [
-            [['parent','child','assignment'], 'required'],
-            [['children_ids'], 'each','rule'=>[ 'string','max'=>16]],
-            [['itemsOrder'], 'each','rule'=>[ 'integer']]
+            [['parent', 'child', 'assignment'], 'required'],
+            [['children_ids'], 'each', 'rule'=>['string', 'max'=>16]],
+            [['itemsOrder'], 'each', 'rule'=>['integer']]
         ];
 
     }
 
 
-    public function assignDefaultValues(){
-        if(!empty($this->defaultValues)){
-            foreach ($this->defaultValues as $attribute =>$value){
+    public function assignDefaultValues() {
+        if (!empty($this->defaultValues)) {
+            foreach ($this->defaultValues as $attribute =>$value) {
                 $this->$attribute = $value;
             }
         }
@@ -118,35 +118,35 @@ 
 
     }
 
-    public function save(){
-        $i=0;
+    public function save() {
+        $i = 0;
         $this->cleanChildrenIds();
 
-        if(is_array($this->children_ids)){
-            foreach ($this->children_ids as $childId){
+        if (is_array($this->children_ids)) {
+            foreach ($this->children_ids as $childId) {
 
-                if(!$this->childExists($childId)){
+                if (!$this->childExists($childId)) {
                     $model = new $this->assignmentClassname;
-                }else{
+                } else {
                     $model = $this->getCurrentChildById($childId);
                 }
 
 
                 $model->{$this->parent_fk_colname} = $this->parent->primaryKey;
-                if($this->hasChildTable){
+                if ($this->hasChildTable) {
                     $model->{$this->child_fk_colname} = $childId;
                 }
                 $model->{$this->child_fk_colname} = $childId;
 
 
                 // set order if order colname is set
-                if($this->order_colname<>""){
+                if ($this->order_colname <> "") {
                     $model->{$this->order_colname} = $i;
                 }
 
                 // assign default Value
-                if(!empty($this->defaultValues)){
-                    foreach ($this->defaultValues as $attribute =>$value){
+                if (!empty($this->defaultValues)) {
+                    foreach ($this->defaultValues as $attribute =>$value) {
                         $model->{$attribute} = $value;
                     }
                 }
@@ -154,9 +154,9 @@ 
                 $this->assignmentItem = $model;
                 $event = new MyAssignmentEvent;
                 $event->item = $model;
-                $this->trigger(self::EVENT_BEFORE_ITEM_SAVE,$event);
+                $this->trigger(self::EVENT_BEFORE_ITEM_SAVE, $event);
 
-                if(!$this->assignmentItem->save()){
+                if (!$this->assignmentItem->save()) {
                     $this->addErrors($this->assignmentItem->errors);
                     return false;
                 }
@@ -166,10 +166,10 @@ 
         }
 
         // delete what was unselected
-        if(is_array($this->current_children)){
-            foreach ($this->current_children as $child){
-                if((is_array($this->children_ids) && !in_array($child->{$this->child_fk_colname}, $this->children_ids))
-                    or ( !is_array($this->children_ids))){
+        if (is_array($this->current_children)) {
+            foreach ($this->current_children as $child) {
+                if ((is_array($this->children_ids) && !in_array($child->{$this->child_fk_colname}, $this->children_ids))
+                    or (!is_array($this->children_ids))) {
 
                     $child->delete();
                 }
@@ -185,24 +185,24 @@ 
 
     public function childExists($childId) {
         $currentChildrenIds = $this->getCurrentChildrenIds(false);
-        if(is_array($currentChildrenIds)){
+        if (is_array($currentChildrenIds)) {
             return in_array($childId, $currentChildrenIds);
         }
         return false;
     }
 
-    public function setCurrentChildren(){
+    public function setCurrentChildren() {
         $query = $this->identifyChildrenQuery();
 
         // if order column is set, we order it ascending
-        if($this->order_colname){
+        if ($this->order_colname) {
             $query->orderBy([$this->order_colname=>SORT_ASC]);
         }
 
         $indexCol = $this->child->primaryKey()[0];
         $children = $query->indexBy($indexCol)->all();
 
-        if ($children){
+        if ($children) {
             $this->current_children = $children;
         }
         $this->getCurrentChildrenIds();
@@ -211,7 +211,7 @@ 
 
 
 
-    public function setLastChild(){
+    public function setLastChild() {
         $query = $this->identifyChildrenQuery();
         $query->orderBy([
             $this->assignment->timeCreatedCol=>SORT_DESC,
@@ -227,7 +227,7 @@ 
     /**
      * @return \yii\db\ActiveQuery
      */
-    public function identifyChildrenQuery(){
+    public function identifyChildrenQuery() {
         $query = $this->assignment->find()
             ->andWhere([$this->parent_fk_colname => $this->parent->primaryKey]);
         return $query;
@@ -241,13 +241,13 @@ 
      * @return array|bool
      */
     public function getCurrentChildrenIds($set = true) {
-        if(is_array($this->current_children)){
+        if (is_array($this->current_children)) {
             $ids = [];
-            foreach ($this->current_children as $child){
+            foreach ($this->current_children as $child) {
 
-                $ids[]=$child->{$this->child_fk_colname};
+                $ids[] = $child->{$this->child_fk_colname};
             }
-            if($set){
+            if ($set) {
                 $this->children_ids = $ids;
             }
             return $ids;
@@ -256,9 +256,9 @@ 
 
     }
     private function getCurrentChildById($id) {
-        if(is_array($this->current_children)){
-            foreach ($this->current_children as $child){
-                if($child->{$this->child_fk_colname} == $id){
+        if (is_array($this->current_children)) {
+            foreach ($this->current_children as $child) {
+                if ($child->{$this->child_fk_colname} == $id) {
                     return $child;
                 }
             }
@@ -271,7 +271,7 @@ 
      * Clean Ids to be integers
      */
     private function cleanChildrenIds() {
-        if(is_array($this->children_ids) && $this->isChildIdInteger){
+        if (is_array($this->children_ids) && $this->isChildIdInteger) {
             $clean = [];
             foreach ($this->children_ids as $id) {
                 $clean[] = intval($id);
@@ -286,8 +286,8 @@ 
      * @return MyActiveRecord
      * @deprecated
      */
-    public function getLastChild(){
-        if(!$this->last_child){
+    public function getLastChild() {
+        if (!$this->last_child) {
             $this->setLastChild();
         }
         return $this->last_child;

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);
                 }
 

MyAssignModel.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
             [[$this->parentIdColumnName, $this->childIdColumnName], 'required'],
             [$this->childIdColumnName, function($attribute) {
                 if ($this->isAlreadyAssigned) {
-                    $this->addError($attribute,Yii::t('app',"Can only be used once!"));
+                    $this->addError($attribute, Yii::t('app', "Can only be used once!"));
                 }
             }],
         ]);

myTemplates/crud/default/views/index.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
     <div class="panel panel-default">
         <div class="panel-body">
-            <?php if(!empty($generator->searchModelClass)): ?>
+            <?php if (!empty($generator->searchModelClass)): ?>
                 <?= "    <?php " . ($generator->indexWidgetType === 'grid' ? "// " : "") ?>echo $this->render('_search', ['model' => $searchModel]); ?>
             <?php endif; ?>
 

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

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 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; ?>
 use <?= ltrim($generator->baseControllerClass, '\\') ?>;
@@ -97,7 +97,7 @@ 
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
         ]);
-<?php else: ?>
+<?php else : ?>
         $dataProvider = new ActiveDataProvider([
             'query' => <?= $modelClass ?>::find(),
         ]);

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

MyActiveRecord.php

Spacing +8 added lines, -8 removed lines

@@ -30,7 +30,7 @@ 
     public function __construct(array $config = [])
     {
         //assign defaultvalues
-        if(!empty($config['defaultValues'])){
+        if (!empty($config['defaultValues'])) {
             $this->defaultValues = $config['defaultValues'];
             $this->assignDefaultValues();
         }
@@ -90,9 +90,9 @@ 
         return $this->{$this->timeClosedCol};
     }
 
-    public function assignDefaultValues(){
-        if(!empty($this->defaultValues)){
-            foreach ($this->defaultValues as $attribute =>$value){
+    public function assignDefaultValues() {
+        if (!empty($this->defaultValues)) {
+            foreach ($this->defaultValues as $attribute =>$value) {
                 $this->$attribute = $value;
             }
         }
@@ -104,9 +104,9 @@ 
      * @param array $filters
      * @return mixed
      */
-    public function getRelationCount($className, $idColumn = null,$filters = null){
-        if(!$idColumn){
-            $idColumn = $this->tableName()."_id";
+    public function getRelationCount($className, $idColumn = null, $filters = null) {
+        if (!$idColumn) {
+            $idColumn = $this->tableName() . "_id";
         }
 
         $config = [
@@ -119,7 +119,7 @@ 
         $query = $model->query()
             ->from($className::tableName())
             ->andWhere([$idColumn => $this->primaryKey]);
-        if($filters){
+        if ($filters) {
             $query->andWhere($filters);
         }
         return $query->count();