o2system / framework

src/Models/NoSql/Traits/ModifierTrait.php

Spacing +28 added lines, -28 removed lines

@@ -81,10 +81,10 @@ 
 
         if (empty($where)) {
             if (empty($this->primaryKeys)) {
-                $where[ $primaryKey ] = $sets[ $primaryKey ];
+                $where[$primaryKey] = $sets[$primaryKey];
             } else {
                 foreach ($this->primaryKeys as $primaryKey) {
-                    $where[ $primaryKey ] = $sets[ $primaryKey ];
+                    $where[$primaryKey] = $sets[$primaryKey];
                 }
             }
         }
@@ -118,7 +118,7 @@ 
         $collection = isset($collection) ? $collection : $this->collection;
 
         if (method_exists($this, 'insertRecordSets')) {
-            foreach($sets as $set) {
+            foreach ($sets as $set) {
                 $this->insertRecordSets($set);
             }
         }
@@ -147,11 +147,11 @@ 
 
         $where = [];
         if (empty($this->primaryKeys)) {
-            $where[ $primaryKey ] = $sets[ $primaryKey ];
-            $this->qb->where($primaryKey, $sets[ $primaryKey ]);
+            $where[$primaryKey] = $sets[$primaryKey];
+            $this->qb->where($primaryKey, $sets[$primaryKey]);
         } else {
             foreach ($this->primaryKeys as $primaryKey) {
-                $where[ $primaryKey ] = $sets[ $primaryKey ];
+                $where[$primaryKey] = $sets[$primaryKey];
             }
         }
 
@@ -160,7 +160,7 @@ 
         $this->primaryKeys = [];
 
         if (method_exists($this, 'updateRecordSets')) {
-            foreach($sets as $set) {
+            foreach ($sets as $set) {
                 $this->updateRecordSets($set);
             }
         }
@@ -199,19 +199,19 @@ 
         $where = [];
 
         if (empty($this->primaryKeys)) {
-            $where[ $primaryKey ] = $id;
-            $sets[ $primaryKey ] = $id;
+            $where[$primaryKey] = $id;
+            $sets[$primaryKey] = $id;
         } elseif (is_array($id)) {
             foreach ($this->primaryKeys as $primaryKey) {
-                $where[ $primaryKey ] = $sets[ $primaryKey ];
-                $sets[ $primaryKey ] = $id[ $primaryKey ];
+                $where[$primaryKey] = $sets[$primaryKey];
+                $sets[$primaryKey] = $id[$primaryKey];
             }
         } else {
             foreach ($this->primaryKeys as $primaryKey) {
-                $where[ $primaryKey ] = $sets[ $primaryKey ];
+                $where[$primaryKey] = $sets[$primaryKey];
             }
 
-            $sets[ reset($this->primaryKeys) ] = $id;
+            $sets[reset($this->primaryKeys)] = $id;
         }
 
         // Reset Primary Keys
@@ -261,7 +261,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->trash($id);
+            $affectedRows[$id] = $this->trash($id);
         }
 
         return $affectedRows;
@@ -274,7 +274,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->trashBy($id, $where, $collection);
+            $affectedRows[$id] = $this->trashBy($id, $where, $collection);
         }
 
         return $affectedRows;
@@ -292,13 +292,13 @@ 
 
         $where = [];
         if (empty($this->primaryKeys)) {
-            $where[ $primaryKey ] = $id;
+            $where[$primaryKey] = $id;
         } elseif (is_array($id)) {
             foreach ($this->primaryKeys as $primaryKey) {
-                $where[ $primaryKey ] = $id[ $primaryKey ];
+                $where[$primaryKey] = $id[$primaryKey];
             }
         } else {
-            $where[ reset($this->primaryKeys) ] = $id;
+            $where[reset($this->primaryKeys)] = $id;
         }
 
         // Reset Primary Keys
@@ -336,7 +336,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->delete($id, $force, $collection);
+            $affectedRows[$id] = $this->delete($id, $force, $collection);
         }
 
         return $affectedRows;
@@ -347,7 +347,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->deleteBy($id, $where, $force, $collection);
+            $affectedRows[$id] = $this->deleteBy($id, $where, $force, $collection);
         }
 
         return $affectedRows;
@@ -364,19 +364,19 @@ 
         $where = [];
 
         if (empty($this->primaryKeys)) {
-            $where[ $primaryKey ] = $id;
-            $sets[ $primaryKey ] = $id;
+            $where[$primaryKey] = $id;
+            $sets[$primaryKey] = $id;
         } elseif (is_array($id)) {
             foreach ($this->primaryKeys as $primaryKey) {
-                $where[ $primaryKey ] = $sets[ $primaryKey ];
-                $sets[ $primaryKey ] = $id[ $primaryKey ];
+                $where[$primaryKey] = $sets[$primaryKey];
+                $sets[$primaryKey] = $id[$primaryKey];
             }
         } else {
             foreach ($this->primaryKeys as $primaryKey) {
-                $where[ $primaryKey ] = $sets[ $primaryKey ];
+                $where[$primaryKey] = $sets[$primaryKey];
             }
 
-            $sets[ reset($this->primaryKeys) ] = $id;
+            $sets[reset($this->primaryKeys)] = $id;
         }
 
         // Reset Primary Keys
@@ -419,7 +419,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->publish($id, $collection);
+            $affectedRows[$id] = $this->publish($id, $collection);
         }
 
         return $affectedRows;
@@ -432,7 +432,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->publishBy($id, $where, $collection);
+            $affectedRows[$id] = $this->publishBy($id, $where, $collection);
         }
 
         return $affectedRows;

src/Models/NoSql/Model.php

Spacing +7 added lines, -7 removed lines

@@ -156,7 +156,7 @@ 
             loader()->addNamespace($reflection->name, $subModelPath);
 
             foreach (glob($subModelPath . '*.php') as $filepath) {
-                $this->validSubModels[ strtolower(pathinfo($filepath, PATHINFO_FILENAME)) ] = $filepath;
+                $this->validSubModels[strtolower(pathinfo($filepath, PATHINFO_FILENAME))] = $filepath;
             }
         }
     }
@@ -183,24 +183,24 @@ 
 
     public function &__get($property)
     {
-        $get[ $property ] = false;
+        $get[$property] = false;
 
         if (o2system()->hasService($property)) {
-            $get[ $property ] = o2system()->getService($property);
+            $get[$property] = o2system()->getService($property);
         } elseif (array_key_exists($property, $this->validSubModels)) {
-            $get[ $property ] = $this->loadSubModel($property);
+            $get[$property] = $this->loadSubModel($property);
         } elseif (o2system()->__isset($property)) {
-            $get[ $property ] = o2system()->__get($property);
+            $get[$property] = o2system()->__get($property);
         }
 
-        return $get[ $property ];
+        return $get[$property];
     }
 
     // ------------------------------------------------------------------------
 
     final protected function loadSubModel($model)
     {
-        if (is_file($this->validSubModels[ $model ])) {
+        if (is_file($this->validSubModels[$model])) {
             $className = '\\' . get_called_class() . '\\' . ucfirst($model);
             $className = str_replace('\Base\\Model', '\Models', $className);
 

src/Models/Sql/Traits/HierarchicalTrait.php

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
                         ]);
                 }
 
-                $update[ 'id' ] = $row->id;
+                $update['id'] = $row->id;
 
                 if ($this->hasChilds($row->id)) {
                     $right = $this->rebuildTree($row->id, $right, $depth + 1);
@@ -96,7 +96,7 @@ 
                         ->update($update = [
                             'record_right' => $right,
                         ]);
-                    $update[ 'id' ] = $row->id;
+                    $update['id'] = $row->id;
                 }
 
                 $i++;

src/Models/Sql/Traits/RecordTrait.php

Spacing +22 added lines, -22 removed lines

@@ -77,58 +77,58 @@
     {
         $timestamp = $this->unixTimestamp === true ? strtotime(date('Y-m-d H:i:s')) : date('Y-m-d H:i:s');
 
-        if ( ! isset($sets[ 'record_status' ])) {
-            $sets[ 'record_status' ] = $this->recordStatus;
+        if ( ! isset($sets['record_status'])) {
+            $sets['record_status'] = $this->recordStatus;
         }
 
         if (empty($this->primaryKeys)) {
             $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id';
 
-            if (empty($sets[ $primaryKey ])) {
-                if ( ! isset($sets[ 'record_create_user' ])) {
-                    $sets[ 'record_create_user' ] = $this->recordUser;
+            if (empty($sets[$primaryKey])) {
+                if ( ! isset($sets['record_create_user'])) {
+                    $sets['record_create_user'] = $this->recordUser;
                 }
 
-                if ( ! isset($sets[ 'record_create_timestamp' ])) {
-                    $sets[ 'record_create_timestamp' ] = $timestamp;
+                if ( ! isset($sets['record_create_timestamp'])) {
+                    $sets['record_create_timestamp'] = $timestamp;
                 } elseif ($this->unixTimestamp) {
-                    $sets[ 'record_create_timestamp' ] = strtotime($sets[ 'record_create_timestamp' ]);
+                    $sets['record_create_timestamp'] = strtotime($sets['record_create_timestamp']);
                 }
             }
         } else {
             foreach ($this->primaryKeys as $primaryKey) {
-                if (empty($sets[ $primaryKey ])) {
-                    if ( ! isset($sets[ 'record_create_user' ])) {
-                        $sets[ 'record_create_user' ] = $this->recordUser;
+                if (empty($sets[$primaryKey])) {
+                    if ( ! isset($sets['record_create_user'])) {
+                        $sets['record_create_user'] = $this->recordUser;
                     }
 
-                    if ( ! isset($sets[ 'record_create_timestamp' ])) {
-                        $sets[ 'record_create_timestamp' ] = $timestamp;
+                    if ( ! isset($sets['record_create_timestamp'])) {
+                        $sets['record_create_timestamp'] = $timestamp;
                     } elseif ($this->unixTimestamp) {
-                        $sets[ 'record_create_timestamp' ] = strtotime($sets[ 'record_create_timestamp' ]);
+                        $sets['record_create_timestamp'] = strtotime($sets['record_create_timestamp']);
                     }
                 }
             }
         }
 
-        $sets[ 'record_update_user' ] = $this->recordUser;
+        $sets['record_update_user'] = $this->recordUser;
 
-        if ( ! isset($sets[ 'record_update_timestamp' ])) {
-            $sets[ 'record_update_timestamp' ] = $timestamp;
+        if ( ! isset($sets['record_update_timestamp'])) {
+            $sets['record_update_timestamp'] = $timestamp;
         } elseif ($this->unixTimestamp) {
-            $sets[ 'record_update_timestamp' ] = strtotime($sets[ 'record_update_timestamp' ]);
+            $sets['record_update_timestamp'] = strtotime($sets['record_update_timestamp']);
         }
     }
 
     protected function updateRecordSets(array &$sets)
     {
-        $sets[ 'record_status' ] = $this->recordStatus;
-        $sets[ 'record_update_user' ] = $this->recordUser;
+        $sets['record_status'] = $this->recordStatus;
+        $sets['record_update_user'] = $this->recordUser;
 
         $timestamp = $this->unixTimestamp === true ? strtotime(date('Y-m-d H:i:s')) : date('Y-m-d H:i:s');
 
-        if ( ! isset($sets[ 'record_update_timestamp' ])) {
-            $sets[ 'record_update_timestamp' ] = $timestamp;
+        if ( ! isset($sets['record_update_timestamp'])) {
+            $sets['record_update_timestamp'] = $timestamp;
         }
     }
 

src/Models/Sql/Traits/ModifierTrait.php

Spacing +38 added lines, -38 removed lines

@@ -46,8 +46,8 @@ 
         }
 
         if (method_exists($this, 'getRecordOrdering')) {
-            if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) {
-                $sets[ 'record_ordering' ] = $this->getRecordOrdering($this->table);
+            if ($this->recordOrdering === true && empty($sets['record_ordering'])) {
+                $sets['record_ordering'] = $this->getRecordOrdering($this->table);
             }
         }
 
@@ -67,7 +67,7 @@ 
     public function insertOrUpdate(array $sets)
     {
         // Try to find
-        if($result = $this->qb->from($this->table)->getWhere($sets)) {
+        if ($result = $this->qb->from($this->table)->getWhere($sets)) {
             return $this->update($sets);
         } else {
             return $this->insert($sets);
@@ -82,8 +82,8 @@ 
             foreach ($sets as $set) {
                 $this->insertRecordSets($set);
 
-                if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) {
-                    $set[ 'record_ordering' ] = $this->getRecordOrdering($this->table);
+                if ($this->recordOrdering === true && empty($sets['record_ordering'])) {
+                    $set['record_ordering'] = $this->getRecordOrdering($this->table);
                 }
             }
         }
@@ -121,10 +121,10 @@ 
 
         if (empty($where)) {
             if (empty($this->primaryKeys)) {
-                $where[ $primaryKey ] = $sets[ $primaryKey ];
+                $where[$primaryKey] = $sets[$primaryKey];
             } else {
                 foreach ($this->primaryKeys as $primaryKey) {
-                    $where[ $primaryKey ] = $sets[ $primaryKey ];
+                    $where[$primaryKey] = $sets[$primaryKey];
                 }
             }
         }
@@ -142,8 +142,8 @@ 
         }
 
         if (method_exists($this, 'getRecordOrdering')) {
-            if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) {
-                $sets[ 'record_ordering' ] = $this->getRecordOrdering($this->table);
+            if ($this->recordOrdering === true && empty($sets['record_ordering'])) {
+                $sets['record_ordering'] = $this->getRecordOrdering($this->table);
             }
         }
 
@@ -195,10 +195,10 @@ 
 
         if (empty($where)) {
             if (empty($this->primaryKeys)) {
-                $where[ $primaryKey ] = $sets[ $primaryKey ];
+                $where[$primaryKey] = $sets[$primaryKey];
             } else {
                 foreach ($this->primaryKeys as $primaryKey) {
-                    $where[ $primaryKey ] = $sets[ $primaryKey ];
+                    $where[$primaryKey] = $sets[$primaryKey];
                 }
             }
         }
@@ -208,7 +208,7 @@ 
         $this->primaryKeys = [];
 
         // Try to find
-        if($result = $this->qb->from($this->table)->getWhere($where)) {
+        if ($result = $this->qb->from($this->table)->getWhere($where)) {
             return $this->update($sets, $where);
         } else {
             return $this->insert($sets);
@@ -225,11 +225,11 @@ 
 
         $where = [];
         if (empty($this->primaryKeys)) {
-            $where[ $primaryKey ] = $sets[ $primaryKey ];
-            $this->qb->where($primaryKey, $sets[ $primaryKey ]);
+            $where[$primaryKey] = $sets[$primaryKey];
+            $this->qb->where($primaryKey, $sets[$primaryKey]);
         } else {
             foreach ($this->primaryKeys as $primaryKey) {
-                $where[ $primaryKey ] = $sets[ $primaryKey ];
+                $where[$primaryKey] = $sets[$primaryKey];
             }
         }
 
@@ -241,8 +241,8 @@ 
             foreach ($sets as $set) {
                 $this->updateRecordSets($set);
 
-                if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) {
-                    $set[ 'record_ordering' ] = $this->getRecordOrdering($this->table);
+                if ($this->recordOrdering === true && empty($sets['record_ordering'])) {
+                    $set['record_ordering'] = $this->getRecordOrdering($this->table);
                 }
             }
         }
@@ -279,19 +279,19 @@ 
         $where = [];
 
         if (empty($this->primaryKeys)) {
-            $where[ $primaryKey ] = $id;
-            $sets[ $primaryKey ] = $id;
+            $where[$primaryKey] = $id;
+            $sets[$primaryKey] = $id;
         } elseif (is_array($id)) {
             foreach ($this->primaryKeys as $primaryKey) {
-                $where[ $primaryKey ] = $sets[ $primaryKey ];
-                $sets[ $primaryKey ] = $id[ $primaryKey ];
+                $where[$primaryKey] = $sets[$primaryKey];
+                $sets[$primaryKey] = $id[$primaryKey];
             }
         } else {
             foreach ($this->primaryKeys as $primaryKey) {
-                $where[ $primaryKey ] = $sets[ $primaryKey ];
+                $where[$primaryKey] = $sets[$primaryKey];
             }
 
-            $sets[ reset($this->primaryKeys) ] = $id;
+            $sets[reset($this->primaryKeys)] = $id;
         }
 
         // Reset Primary Keys
@@ -341,7 +341,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->trash($id);
+            $affectedRows[$id] = $this->trash($id);
         }
 
         return $affectedRows;
@@ -354,7 +354,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->trashBy($id, $where);
+            $affectedRows[$id] = $this->trashBy($id, $where);
         }
 
         return $affectedRows;
@@ -368,13 +368,13 @@ 
 
         $where = [];
         if (empty($this->primaryKeys)) {
-            $where[ $primaryKey ] = $id;
+            $where[$primaryKey] = $id;
         } elseif (is_array($id)) {
             foreach ($this->primaryKeys as $primaryKey) {
-                $where[ $primaryKey ] = $id[ $primaryKey ];
+                $where[$primaryKey] = $id[$primaryKey];
             }
         } else {
-            $where[ reset($this->primaryKeys) ] = $id;
+            $where[reset($this->primaryKeys)] = $id;
         }
 
         // Reset Primary Keys
@@ -412,7 +412,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->delete($id, $force);
+            $affectedRows[$id] = $this->delete($id, $force);
         }
 
         return $affectedRows;
@@ -423,7 +423,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->deleteBy($id, $where, $force);
+            $affectedRows[$id] = $this->deleteBy($id, $where, $force);
         }
 
         return $affectedRows;
@@ -439,19 +439,19 @@ 
         $where = [];
 
         if (empty($this->primaryKeys)) {
-            $where[ $primaryKey ] = $id;
-            $sets[ $primaryKey ] = $id;
+            $where[$primaryKey] = $id;
+            $sets[$primaryKey] = $id;
         } elseif (is_array($id)) {
             foreach ($this->primaryKeys as $primaryKey) {
-                $where[ $primaryKey ] = $sets[ $primaryKey ];
-                $sets[ $primaryKey ] = $id[ $primaryKey ];
+                $where[$primaryKey] = $sets[$primaryKey];
+                $sets[$primaryKey] = $id[$primaryKey];
             }
         } else {
             foreach ($this->primaryKeys as $primaryKey) {
-                $where[ $primaryKey ] = $sets[ $primaryKey ];
+                $where[$primaryKey] = $sets[$primaryKey];
             }
 
-            $sets[ reset($this->primaryKeys) ] = $id;
+            $sets[reset($this->primaryKeys)] = $id;
         }
 
         // Reset Primary Keys
@@ -494,7 +494,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->publish($id);
+            $affectedRows[$id] = $this->publish($id);
         }
 
         return $affectedRows;
@@ -507,7 +507,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->publishBy($id, $where);
+            $affectedRows[$id] = $this->publishBy($id, $where);
         }
 
         return $affectedRows;

src/Models/Sql/Model.php

Spacing +3 added lines, -3 removed lines

@@ -161,7 +161,7 @@ 
                 if ($filepath === $filePath) {
                     continue;
                 }
-                $this->validSubModels[ camelcase(pathinfo($filepath, PATHINFO_FILENAME)) ] = $filepath;
+                $this->validSubModels[camelcase(pathinfo($filepath, PATHINFO_FILENAME))] = $filepath;
             }
         }
     }
@@ -207,7 +207,7 @@ 
             }
         }
 
-        if (empty($get[ $property ])) {
+        if (empty($get[$property])) {
             if (o2system()->hasService($property)) {
                 return o2system()->getService($property);
             } elseif ($this->hasSubModel($property)) {
@@ -248,7 +248,7 @@ 
     final public function hasSubModel($model)
     {
         if (array_key_exists($model, $this->validSubModels)) {
-            return (bool)is_file($this->validSubModels[ $model ]);
+            return (bool)is_file($this->validSubModels[$model]);
         }
 
         return false;

src/Models/Sql/Relations/Maps/Reference.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         $referenceModel,
         $foreignKey = null
     ) {
-        $this->currentModel =& $currentModel;
+        $this->currentModel = & $currentModel;
         $this->currentTable = $currentModel->table;
         $this->currentPrimaryKey = $currentModel->primaryKey;
 

src/Models/Sql/Relations/Maps/Inverse.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         $referenceModel,
         $foreignKey = null
     ) {
-        $this->currentModel =& $currentModel;
+        $this->currentModel = & $currentModel;
         $this->currentTable = $currentModel->table;
         $this->currentPrimaryKey = $currentModel->primaryKey;
 

src/Models/Sql/Relations/Maps/Intermediary.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         $intermediaryReferenceForeignKey = null
     ) {
 
-        $this->currentModel =& $currentModel;
+        $this->currentModel = & $currentModel;
         $this->currentTable = $currentModel->table;
         $this->currentPrimaryKey = $currentModel->primaryKey;