TonisOrmisson / yii2-myabstract

HasStatusModel.php

Spacing +2 added lines, -2 removed lines

@@ -27,8 +27,8 @@
      */
     public function init()
     {
-        if(!$this->parentClassName){
-            throw new InvalidConfigException('parentClassName must be set for '.static::class);
+        if (!$this->parentClassName) {
+            throw new InvalidConfigException('parentClassName must be set for ' . static::class);
         }
 
         /** @var MyActiveRecord $parent */

StaticModel.php

Spacing +6 added lines, -6 removed lines

@@ -12,7 +12,7 @@ 
     /**
      * @return static[]
      */
-    public static function getModels(){
+    public static function getModels() {
         return [];
     }
 
@@ -20,9 +20,9 @@ 
      * @param $id
      * @return static
      */
-    public static function getById($id){
+    public static function getById($id) {
         $models = static::getModels();
-        if(isset($models[$id])){
+        if (isset($models[$id])) {
             return new static($models[$id]);
         }
         return null;
@@ -31,10 +31,10 @@ 
      * @param $key
      * @return static
      */
-    public static function getByKey($key){
-        $arr = MyArrayHelper::indexByColumn(static::getModels(),static::$keyColumn);
+    public static function getByKey($key) {
+        $arr = MyArrayHelper::indexByColumn(static::getModels(), static::$keyColumn);
 
-        if(isset($arr[$key])){
+        if (isset($arr[$key])) {
             return new static($arr[$key]);
         }
         return null;

StatusModel.php

Spacing +6 added lines, -6 removed lines

@@ -12,7 +12,7 @@ 
  */
 class StatusModel extends StaticModel implements StatusInterface
 {
-    const STATUS_CREATED        = "created";
+    const STATUS_CREATED = "created";
 
     /** @var  integer $id*/
     public $id;
@@ -27,7 +27,7 @@ 
         return [
             self::STATUS_CREATED => [
                 'id' => self::STATUS_CREATED,
-                'label' => Yii::t('app','Created'),
+                'label' => Yii::t('app', 'Created'),
             ],
 
         ];
@@ -47,13 +47,13 @@ 
     }
 
 
-    public static function isStatus($id){
-        return (!self::getById($id)==false);
+    public static function isStatus($id) {
+        return (!self::getById($id) == false);
     }
 
-    public static function getStatusLabel($id){
+    public static function getStatusLabel($id) {
         $status = self::getById($id);
-        if(!empty($status)) {
+        if (!empty($status)) {
             return $status->label;
         }
         return null;

Module.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     /**
      * @return User
      */
-    public function getUserClass(){
+    public function getUserClass() {
 
         return new $this->userClassName;
     }

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

Spacing +46 added lines, -46 removed lines

@@ -46,12 +46,12 @@ 
     public function save($runValidation = true, $attributeNames = null)
     {
         // if there is no user Id, we use the default ID 1
-        if(!isset(Yii::$app->user) || empty(Yii::$app->user->identity)){
+        if (!isset(Yii::$app->user) || empty(Yii::$app->user->identity)) {
             $userId = 1;
-        }else{
+        } else {
             $userId = Yii::$app->user->identity->getId();
         }
-        if ($this->isNewRecord){
+        if ($this->isNewRecord) {
             $this->{$this->timeClosedCol} = $this->dateHelper->getEndOfTime();
             $this->{$this->userCreatedCol} = $userId;
             $this->{$this->timeCreatedCol} = $this->dateHelper->getDatetime6();
@@ -89,37 +89,37 @@ 
      * {@inheritdoc}
      */
     public function delete() {
-        if($this->is_logicDelete){
+        if ($this->is_logicDelete) {
             $this->beforeDelete();
             // don't put new data if deleting
             $this->setAttributes($this->oldAttributes);
 
             // delete logically
-            if($this->userUpdatedCol){
-                $this->{$this->userUpdatedCol} =Yii::$app->user->identity->getId();
+            if ($this->userUpdatedCol) {
+                $this->{$this->userUpdatedCol} = Yii::$app->user->identity->getId();
             }
-            if($this->userClosedCol){
-                $this->{$this->userClosedCol} =Yii::$app->user->identity->getId();
+            if ($this->userClosedCol) {
+                $this->{$this->userClosedCol} = Yii::$app->user->identity->getId();
             }
 
-            if($this->timeUpdatedCol){
-                $this->{$this->timeUpdatedCol} =  $this->dateHelper->getDatetime6();
+            if ($this->timeUpdatedCol) {
+                $this->{$this->timeUpdatedCol} = $this->dateHelper->getDatetime6();
             }
 
-            if($this->timeClosedCol){
-                $this->{$this->timeClosedCol} =  $this->dateHelper->getDatetime6();
+            if ($this->timeClosedCol) {
+                $this->{$this->timeClosedCol} = $this->dateHelper->getDatetime6();
             }
 
             // don't validate on deleting
-            if($this->save(false)){
+            if ($this->save(false)) {
                 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;
@@ -128,30 +128,30 @@ 
     }
 
 
-    public static function bulkCopy($objects,$replaceParams) {
+    public static function bulkCopy($objects, $replaceParams) {
         /**
          * @var yii\db\ActiveRecord $model
          */
         $model = new static;
-        if(!empty($objects)){
+        if (!empty($objects)) {
             $rows = [];
             $cols = [];
             foreach ($objects as $object) {
-                if(!empty($object->attributes)){
+                if (!empty($object->attributes)) {
                     $row = $object->attributes;
                     $cols = $model->attributes();
-                    foreach($replaceParams as $key =>$value){
+                    foreach ($replaceParams as $key =>$value) {
                         // remove primary keys (assuming auto-increment)
-                        foreach ($model->primaryKey as $pk){
+                        foreach ($model->primaryKey as $pk) {
                             unset($row[$pk]);
                         }
                         // remove pk fields from cols
                         $cols = array_diff($cols, $model->primaryKey);
                         $row[$key] = $value;
                     }
-                    $rows[]=$row;
-                }  else {
-                    throw new InvalidParamException('Missing object attributes in '. get_called_class().' '.__FUNCTION__);
+                    $rows[] = $row;
+                } else {
+                    throw new InvalidParamException('Missing object attributes in ' . get_called_class() . ' ' . __FUNCTION__);
                 }
 
             }
@@ -173,7 +173,7 @@ 
          * @var \yii\db\ActiveRecord
          */
         $model = new static;
-        if(!empty($params)){
+        if (!empty($params)) {
 
             $baseParams = [
                 $model->timeClosedCol=>$dateHelper->getDatetime6(),
@@ -184,13 +184,13 @@ 
 
             $conditions = [];
             $conditions[] = 'and';
-            $conditions[] = ['>',static::tableName().".`".$model->timeClosedCol.'`',$dateHelper->getDatetime6()];
+            $conditions[] = ['>', static::tableName() . ".`" . $model->timeClosedCol . '`', $dateHelper->getDatetime6()];
             $conditions[] = $params;
-            \Yii::$app->db->createCommand()->update(parent::tableName(), $baseParams,$conditions)->execute();
+            \Yii::$app->db->createCommand()->update(parent::tableName(), $baseParams, $conditions)->execute();
             self::updateClosingTime(static::tableName());
 
-        }else{
-            throw new yii\base\InvalidArgumentException('No conditions defined for '. get_called_class().' '.__FUNCTION__);
+        } else {
+            throw new yii\base\InvalidArgumentException('No conditions defined for ' . get_called_class() . ' ' . __FUNCTION__);
         }
 
 
@@ -203,9 +203,9 @@ 
      */
     public function rules() {
         return [
-            [[$this->userCreatedCol, $this->userUpdatedCol, $this->timeCreatedCol,$this->timeUpdatedCol, $this->timeClosedCol], 'required'],
+            [[$this->userCreatedCol, $this->userUpdatedCol, $this->timeCreatedCol, $this->timeUpdatedCol, $this->timeClosedCol], 'required'],
             [[$this->userCreatedCol, $this->userUpdatedCol, $this->userClosedCol], 'integer'],
-            [[$this->timeCreatedCol,$this->timeUpdatedCol,  $this->timeClosedCol], 'safe'],
+            [[$this->timeCreatedCol, $this->timeUpdatedCol, $this->timeClosedCol], 'safe'],
         ];
     }
     /**
@@ -230,15 +230,15 @@ 
     public static function find() {
         $child = new static;
         $lastClosingTime = static::lastClosingTime(parent::tableName());
-        $query =parent::find()
-            ->andFilterWhere(['>',static::tableName().".`".$child->timeClosedCol.'`',$lastClosingTime]);
+        $query = parent::find()
+            ->andFilterWhere(['>', static::tableName() . ".`" . $child->timeClosedCol . '`', $lastClosingTime]);
         return  $query;
     }
 
 
-    public static function getCount($filter = null){
+    public static function getCount($filter = null) {
         $query = self::find();
-        if($filter){
+        if ($filter) {
             $query->andFilterWhere($filter);
         }
         return $query->count();
@@ -251,7 +251,7 @@ 
     public static function query() {
         $child = new static;
         $dateHelper = new DateHelper();
-        return (new Query())->andFilterWhere(['>',parent::tableName().".`".$child->timeClosedCol.'`', $dateHelper->getDatetime6()]);
+        return (new Query())->andFilterWhere(['>', parent::tableName() . ".`" . $child->timeClosedCol . '`', $dateHelper->getDatetime6()]);
     }
 
     /**
@@ -261,7 +261,7 @@ 
      * @return bool|static
      * @throws yii\base\UserException
      */
-    public static function copy($model, $map){
+    public static function copy($model, $map) {
         /**
          * @var \yii\db\ActiveRecord
          */
@@ -270,9 +270,9 @@ 
         foreach ($map as $key => $value) {
             $newModel->{$key} = $value;
         }
-        if($newModel->save()){
+        if ($newModel->save()) {
             return $newModel;
-        }else{
+        } else {
             throw new yii\base\UserException('Error copying model');
         }
     }
@@ -281,15 +281,15 @@ 
      * @param string $tableName
      * @return mixed|string
      */
-    private static function lastClosingTime($tableName){
+    private static function lastClosingTime($tableName) {
         $dateHelper = new DateHelper();
 
-        if(!self::hasClosing($tableName)){
+        if (!self::hasClosing($tableName)) {
             self::createClosingRow($tableName);
         }
         /** @var Closing $closing */
         $closing = Closing::findOne($tableName);
-        if($closing){
+        if ($closing) {
             return $closing->last_closing_time;
         }
         return $dateHelper->getDatetime6();
@@ -299,7 +299,7 @@ 
      * @param string $tableName
      * @return bool
      */
-    private static function hasClosing($tableName){
+    private static function hasClosing($tableName) {
          $closing = Closing::findOne($tableName);
          return !($closing == null);
     }
@@ -308,9 +308,9 @@ 
      * @param $tableName
      * @return Closing
      */
-    private static function createClosingRow($tableName){
+    private static function createClosingRow($tableName) {
 
-        if(!self::hasClosing($tableName)){
+        if (!self::hasClosing($tableName)) {
             $dateHelper = new DateHelper();
             $closing = new Closing([
                 'table_name'=>$tableName,
@@ -322,8 +322,8 @@ 
         return null;
     }
 
-    private static function updateClosingTime($tableName){
-        if(!self::hasClosing($tableName)){
+    private static function updateClosingTime($tableName) {
+        if (!self::hasClosing($tableName)) {
             self::createClosingRow($tableName);
         }
         /** @var Closing $closing */

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

Spacing +11 added lines, -11 removed lines

@@ -29,16 +29,16 @@ 
      * @return boolean
      * @throws NotSupportedException
      */
-    public function isActive(){
+    public function isActive() {
         /** @var StatusModel $statusModel */
         $statusModel = new self::$statusModelClass;
-        if (method_exists($statusModel,'isActive')) {
+        if (method_exists($statusModel, 'isActive')) {
             return $statusModel::isActive($this->currentStatus->id);
         }
-        throw new NotSupportedException('isActive missing for: '.self::$statusModelClass);
+        throw new NotSupportedException('isActive missing for: ' . self::$statusModelClass);
     }
 
-    protected function addStatus($status){
+    protected function addStatus($status) {
         /** @var HasStatusModel $hasStatus */
         $hasStatus = new static::$hasStatusClassName;
         $hasStatus->status = $status;
@@ -52,14 +52,14 @@ 
     public function afterSave($insert, $changedAttributes)
     {
 
-        if($insert){
+        if ($insert) {
             // add a created status im the status history if some other status is assigned
-            if($this->status != StatusModel::STATUS_CREATED){
+            if ($this->status != StatusModel::STATUS_CREATED) {
                 $this->addStatus(StatusModel::STATUS_CREATED);
             }
             $this->addStatus($this->status);
-        }else{
-            if(isset($changedAttributes['status'])){
+        } else {
+            if (isset($changedAttributes['status'])) {
                 $this->addStatus($this->status);
             }
         }
@@ -107,16 +107,16 @@ 
      * @param integer[] $model_ids
      * @throws ErrorException
      */
-    public static function bulkSetStatus($status, $model_ids){
+    public static function bulkSetStatus($status, $model_ids) {
         $query = new Query();
         /** @var StatusModel $class */
         $class = new static::$statusModelClass;
 
-        if(!$class::isStatus($status)){
+        if (!$class::isStatus($status)) {
             throw new ErrorException('Invalid Status');
         }
         $query->createCommand()
-            ->update(static::tableName(),['status'=>$status],['in',static::primaryKey()[0],$model_ids])
+            ->update(static::tableName(), ['status'=>$status], ['in', static::primaryKey()[0], $model_ids])
             ->execute();
     }
 

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

Settings.php

Spacing +15 added lines, -15 removed lines

@@ -23,7 +23,7 @@ 
     public $doCheck = true;
 
     /** @var string[] $alwaysSkipCheckAttributes */
-    private static $alwaysSkipCheckAttributes = ['settings','itemClass','typeRelationName','valueField','doCheck','skipCheckAttributes'];
+    private static $alwaysSkipCheckAttributes = ['settings', 'itemClass', 'typeRelationName', 'valueField', 'doCheck', 'skipCheckAttributes'];
 
 
     /** @var string[] $skipCheckAttributes extended attributed that we skip in checking */
@@ -33,7 +33,7 @@ 
     {
         parent::init();
 
-        if(!$this->itemClass){
+        if (!$this->itemClass) {
             throw new yii\base\InvalidArgumentException('ItemClass must be defined');
         }
         $this->checkSettings();
@@ -45,17 +45,17 @@ 
     /**
      * Check if all defined attributes exist in settings[] and throw an error if its missing
      */
-    protected function checkSettings(){
-        if($this->doCheck){
-            $skipAttributes = array_merge($this->skipCheckAttributes,self::$alwaysSkipCheckAttributes);
-            $checkAttributes = array_diff(array_keys($this->attributes),$skipAttributes);
+    protected function checkSettings() {
+        if ($this->doCheck) {
+            $skipAttributes = array_merge($this->skipCheckAttributes, self::$alwaysSkipCheckAttributes);
+            $checkAttributes = array_diff(array_keys($this->attributes), $skipAttributes);
 
-            if(!empty($checkAttributes)){
-                foreach ($checkAttributes as $checkAttribute){
-                    $class =$this->itemClass;
+            if (!empty($checkAttributes)) {
+                foreach ($checkAttributes as $checkAttribute) {
+                    $class = $this->itemClass;
 
-                    if(!$class::getByKey($checkAttribute)){
-                        throw new yii\base\InvalidConfigException('Key "'.$checkAttribute.'" is missing in '.$class);
+                    if (!$class::getByKey($checkAttribute)) {
+                        throw new yii\base\InvalidConfigException('Key "' . $checkAttribute . '" is missing in ' . $class);
                     }
                 }
             }
@@ -64,8 +64,8 @@ 
     }
 
     public function beforeValidate() {
-        foreach ($this->attributes as $key => $value){
-            if ($value === ""){
+        foreach ($this->attributes as $key => $value) {
+            if ($value === "") {
                 $this->$key = NULL;
             }
         }
@@ -74,11 +74,11 @@ 
     }
 
     public function loadStrings() {
-        if(!empty($this->settings)){
+        if (!empty($this->settings)) {
             foreach ($this->settings as $key => $setting) {
                 // only accept keys that are described in the model
                 $type = SurveyLanguagesettingType::getByKey($key);
-                if($type){
+                if ($type) {
                     $this->{$key} = $setting->{$this->valueField};
                 }
             }

ModelWithHasStatus.php

Spacing +2 added lines, -2 removed lines

@@ -24,8 +24,8 @@
 
     public function init()
     {
-        if(!static::$hasStatusClassName){
-            throw new InvalidConfigException('hasStatusClassName must be set for '.static::class);
+        if (!static::$hasStatusClassName) {
+            throw new InvalidConfigException('hasStatusClassName must be set for ' . static::class);
         }
 
         parent::init();

ApiResult.php

Spacing +1 added lines, -1 removed lines

@@ -8,6 +8,6 @@
     public $success = false;
 
     /** @var string[] $errors Error messages (if any) */
-    public $errors =  [];
+    public $errors = [];
 
 }
\ No newline at end of file