o2system / reactor

src/Models/Sql/Traits/RecordTrait.php

Spacing +21 added lines, -21 removed lines

@@ -85,57 +85,57 @@
 
         $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->primary_keys)) {
             $primary_key = isset($this->primary_key) ? $this->primary_key : 'id';
 
-            if (empty($sets[ $primary_key ])) {
-                if ( ! isset($sets[ 'record_create_user' ])) {
-                    $sets[ 'record_create_user' ] = $this->recordUser;
+            if (empty($sets[$primary_key])) {
+                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;
                 }
             }
         } else {
             foreach ($this->primary_keys as $primary_key) {
-                if (empty($sets[ $primary_key ])) {
-                    if ( ! isset($sets[ 'record_create_user' ])) {
-                        $sets[ 'record_create_user' ] = $this->recordUser;
+                if (empty($sets[$primary_key])) {
+                    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;
                     }
                 }
             }
         }
 
-        $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;
         }
     }
 
     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;
         }
 
         if ($this->recordStatus === 'PUBLISH') {
-            $sets[ 'record_delete_timestamp' ] = null;
-            $sets[ 'record_delete_user' ] = null;
+            $sets['record_delete_timestamp'] = null;
+            $sets['record_delete_user'] = null;
         }
     }
 

src/Models/Sql/Traits/ModifierTrait.php

Spacing +35 added lines, -35 removed lines

@@ -49,8 +49,8 @@ 
         }
 
         if (method_exists($this, 'getRecordOrdering')) {
-            if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) {
-                $sets[ 'record_ordering' ] = $this->getRecordOrdering($table);
+            if ($this->recordOrdering === true && empty($sets['record_ordering'])) {
+                $sets['record_ordering'] = $this->getRecordOrdering($table);
             }
         }
 
@@ -87,10 +87,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];
                 }
             }
         }
@@ -108,8 +108,8 @@ 
         }
 
         if (method_exists($this, 'getRecordOrdering')) {
-            if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) {
-                $sets[ 'record_ordering' ] = $this->getRecordOrdering($table);
+            if ($this->recordOrdering === true && empty($sets['record_ordering'])) {
+                $sets['record_ordering'] = $this->getRecordOrdering($table);
             }
         }
 
@@ -133,8 +133,8 @@ 
             foreach ($sets as $set) {
                 $this->insertRecordSets($set);
 
-                if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) {
-                    $set[ 'record_ordering' ] = $this->getRecordOrdering($table);
+                if ($this->recordOrdering === true && empty($sets['record_ordering'])) {
+                    $set['record_ordering'] = $this->getRecordOrdering($table);
                 }
             }
         }
@@ -163,11 +163,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];
             }
         }
 
@@ -179,8 +179,8 @@ 
             foreach ($sets as $set) {
                 $this->updateRecordSets($set);
 
-                if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) {
-                    $set[ 'record_ordering' ] = $this->getRecordOrdering($table);
+                if ($this->recordOrdering === true && empty($sets['record_ordering'])) {
+                    $set['record_ordering'] = $this->getRecordOrdering($table);
                 }
             }
         }
@@ -219,19 +219,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
@@ -281,7 +281,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->trash($id);
+            $affectedRows[$id] = $this->trash($id);
         }
 
         return $affectedRows;
@@ -294,7 +294,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->trashBy($id, $where, $table);
+            $affectedRows[$id] = $this->trashBy($id, $where, $table);
         }
 
         return $affectedRows;
@@ -304,7 +304,7 @@ 
 
     public function delete($id, $force = false, $table = null)
     {
-        if ((isset($table) AND is_bool($table)) OR ! isset($table)) {
+        if ((isset($table) AND is_bool($table)) OR !isset($table)) {
             $table = $this->table;
         }
 
@@ -312,13 +312,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
@@ -356,7 +356,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->delete($id, $force, $table);
+            $affectedRows[$id] = $this->delete($id, $force, $table);
         }
 
         return $affectedRows;
@@ -367,7 +367,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->deleteBy($id, $where, $force, $table);
+            $affectedRows[$id] = $this->deleteBy($id, $where, $force, $table);
         }
 
         return $affectedRows;
@@ -384,19 +384,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
@@ -439,7 +439,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->publish($id, $table);
+            $affectedRows[$id] = $this->publish($id, $table);
         }
 
         return $affectedRows;
@@ -452,7 +452,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->publishBy($id, $where, $table);
+            $affectedRows[$id] = $this->publishBy($id, $where, $table);
         }
 
         return $affectedRows;

src/Models/Sql/Traits/HierarchicalTrait.php

Spacing +4 added lines, -4 removed lines

@@ -70,7 +70,7 @@ 
                         ]);
                 }
 
-                $update[ 'id' ] = $row->id;
+                $update['id'] = $row->id;
 
                 if ($this->hasChild($row->id)) {
                     $right = $this->rebuild($row->id, $right, $depth + 1);
@@ -80,7 +80,7 @@ 
                         ->update($update = [
                             'record_right' => $right,
                         ]);
-                    $update[ 'id' ] = $row->id;
+                    $update['id'] = $row->id;
                 }
 
                 $i++;
@@ -109,7 +109,7 @@ 
             ->get();
 
         if ($result) {
-            return (bool)($result->count() == 0 ? false : true);
+            return (bool) ($result->count() == 0 ? false : true);
         }
 
         return false;
@@ -161,7 +161,7 @@ 
             ->get();
 
         if ($result) {
-            return (bool)($result->count() == 0 ? false : true);
+            return (bool) ($result->count() == 0 ? false : true);
         }
 
         return false;

src/Models/Sql/DataObjects/Result.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
             $ormResult = new \SplFixedArray($result->count());
 
             foreach ($result as $key => $row) {
-                $ormResult[ $key ] = new Result\Row($row, $model);
+                $ormResult[$key] = new Result\Row($row, $model);
             }
 
             parent::__construct($ormResult->toArray());

src/Models/Sql/DataObjects/Result/Row.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
     {
         $this->model = new SplClassInfo($model);
 
-        if ( ! models()->has($this->model->getParameter())) {
+        if (!models()->has($this->model->getParameter())) {
             models()->register($this->model->getParameter(), $model);
         }
 

src/Models/Sql/Model.php

Spacing +8 added lines, -8 removed lines

@@ -141,23 +141,23 @@ 
         $filename = pathinfo($filePath, PATHINFO_FILENAME);
 
         // Get model class directory name
-        $dirName = dirname($filePath) . DIRECTORY_SEPARATOR;
+        $dirName = dirname($filePath).DIRECTORY_SEPARATOR;
 
         if ($filename === 'Model') {
-            $subModelsDirName = dirname($dirName) . DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR;
+            $subModelsDirName = dirname($dirName).DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR;
 
             if (is_dir($subModelsDirName)) {
                 $subModelPath = $subModelsDirName;
             }
-        } elseif (is_dir($subModelsDirName = $dirName . $filename . DIRECTORY_SEPARATOR)) {
+        } elseif (is_dir($subModelsDirName = $dirName.$filename.DIRECTORY_SEPARATOR)) {
             $subModelPath = $subModelsDirName;
         }
 
         if (isset($subModelPath)) {
             loader()->addNamespace($reflection->name, $subModelPath);
 
-            foreach (glob($subModelPath . '*.php') as $filepath) {
-                $this->validSubModels[ camelcase(pathinfo($filepath, PATHINFO_FILENAME)) ] = $filepath;
+            foreach (glob($subModelPath.'*.php') as $filepath) {
+                $this->validSubModels[camelcase(pathinfo($filepath, PATHINFO_FILENAME))] = $filepath;
             }
         }
     }
@@ -199,7 +199,7 @@ 
             }
         }
 
-        if (empty($get[ $property ])) {
+        if (empty($get[$property])) {
             if (o2system()->hasService($property)) {
                 return o2system()->getService($property);
             } elseif (array_key_exists($property, $this->validSubModels)) {
@@ -216,8 +216,8 @@ 
 
     final protected function loadSubModel($model)
     {
-        if (is_file($this->validSubModels[ $model ])) {
-            $className = '\\' . get_called_class() . '\\' . ucfirst($model);
+        if (is_file($this->validSubModels[$model])) {
+            $className = '\\'.get_called_class().'\\'.ucfirst($model);
             $className = str_replace('\Base\\Model', '\Models', $className);
 
             if (class_exists($className)) {

src/autoload.php

Spacing +4 added lines, -4 removed lines

@@ -16,7 +16,7 @@ 
  * @param $className
  */
 spl_autoload_register(
-    function ($className) {
+    function($className) {
         if (strpos($className, 'O2System\Reactor\\') === false) {
             return;
         }
@@ -27,13 +27,13 @@ 
         if ($lastNsPos = strripos($className, '\\')) {
             $namespace = substr($className, 0, $lastNsPos);
             $className = substr($className, $lastNsPos + 1);
-            $filePath = $namespace . '\\';
+            $filePath = $namespace.'\\';
         }
 
-        $filePath .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+        $filePath .= str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
 
         // Fixed Path
-        $filePath = str_replace('O2System\Reactor\\', __DIR__ . DIRECTORY_SEPARATOR, $filePath);
+        $filePath = str_replace('O2System\Reactor\\', __DIR__.DIRECTORY_SEPARATOR, $filePath);
         $filePath = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $filePath);
 
         if (file_exists($filePath)) {

src/Reactor.php

Spacing +19 added lines, -19 removed lines

@@ -48,8 +48,8 @@ 
  *
  * WITH TRAILING SLASH!
  */
-if ( ! defined('PATH_VENDOR')) {
-    define('PATH_VENDOR', PATH_ROOT . 'vendor' . DIRECTORY_SEPARATOR);
+if (!defined('PATH_VENDOR')) {
+    define('PATH_VENDOR', PATH_ROOT.'vendor'.DIRECTORY_SEPARATOR);
 }
 
 /*
@@ -61,8 +61,8 @@ 
  *
  * WITH TRAILING SLASH!
  */
-if ( ! defined('PATH_FRAMEWORK')) {
-    define('PATH_FRAMEWORK', __DIR__ . DIRECTORY_SEPARATOR);
+if (!defined('PATH_FRAMEWORK')) {
+    define('PATH_FRAMEWORK', __DIR__.DIRECTORY_SEPARATOR);
 }
 
 /*
@@ -74,8 +74,8 @@ 
  *
  * WITH TRAILING SLASH!
  */
-if ( ! defined('PATH_APP')) {
-    define('PATH_APP', PATH_ROOT . DIR_APP . DIRECTORY_SEPARATOR);
+if (!defined('PATH_APP')) {
+    define('PATH_APP', PATH_ROOT.DIR_APP.DIRECTORY_SEPARATOR);
 }
 
 /*
@@ -87,8 +87,8 @@ 
  *
  * WITH TRAILING SLASH!
  */
-if ( ! defined('PATH_PUBLIC')) {
-    define('PATH_PUBLIC', PATH_ROOT . DIR_PUBLIC . DIRECTORY_SEPARATOR);
+if (!defined('PATH_PUBLIC')) {
+    define('PATH_PUBLIC', PATH_ROOT.DIR_PUBLIC.DIRECTORY_SEPARATOR);
 }
 
 /*
@@ -100,8 +100,8 @@ 
  *
  * WITH TRAILING SLASH!
  */
-if ( ! defined('PATH_CACHE')) {
-    define('PATH_CACHE', PATH_ROOT . DIR_CACHE . DIRECTORY_SEPARATOR);
+if (!defined('PATH_CACHE')) {
+    define('PATH_CACHE', PATH_ROOT.DIR_CACHE.DIRECTORY_SEPARATOR);
 }
 
 /*
@@ -113,8 +113,8 @@ 
  *
  * WITH TRAILING SLASH!
  */
-if ( ! defined('PATH_STORAGE')) {
-    define('PATH_STORAGE', PATH_ROOT . DIR_STORAGE . DIRECTORY_SEPARATOR);
+if (!defined('PATH_STORAGE')) {
+    define('PATH_STORAGE', PATH_ROOT.DIR_STORAGE.DIRECTORY_SEPARATOR);
 }
 
 /*
@@ -126,8 +126,8 @@ 
  *
  * WITH TRAILING SLASH!
  */
-if ( ! defined('PATH_RESOURCES')) {
-    define('PATH_RESOURCES', PATH_ROOT . DIR_RESOURCES . DIRECTORY_SEPARATOR);
+if (!defined('PATH_RESOURCES')) {
+    define('PATH_RESOURCES', PATH_ROOT.DIR_RESOURCES.DIRECTORY_SEPARATOR);
 }
 
 
@@ -136,14 +136,14 @@ 
  * FRAMEWORK CONSTANTS
  *---------------------------------------------------------------
  */
-require __DIR__ . '/Config/Constants.php';
+require __DIR__.'/Config/Constants.php';
 
 /*
  *---------------------------------------------------------------
  * FRAMEWORK HELPERS
  *---------------------------------------------------------------
  */
-require __DIR__ . '/Helpers/Reactor.php';
+require __DIR__.'/Helpers/Reactor.php';
 
 /**
  * Class Reactor
@@ -259,12 +259,12 @@ 
                 }
 
                 if (profiler() !== false) {
-                    profiler()->watch('Instantiating Requested Commander: ' . $commander->getClass());
+                    profiler()->watch('Instantiating Requested Commander: '.$commander->getClass());
                 }
                 $requestCommander = $commander->getInstance();
 
                 if (profiler() !== false) {
-                    profiler()->watch('Execute Requested Commander: ' . $commander->getClass());
+                    profiler()->watch('Execute Requested Commander: '.$commander->getClass());
                 }
                 $requestCommander->execute();
 
@@ -321,7 +321,7 @@ 
                 }
 
                 if (profiler() !== false) {
-                    profiler()->watch('Instantiating Requested Controller: ' . $controller->getClass());
+                    profiler()->watch('Instantiating Requested Controller: '.$controller->getClass());
                 }
                 $requestController = $controller->getInstance();
 

src/Containers/Models.php

Spacing +6 added lines, -6 removed lines

@@ -37,9 +37,9 @@ 
     public function __construct()
     {
         if ($config = config()->loadFile('database', true)) {
-            if ( ! empty($config[ 'default' ][ 'hostname' ]) AND ! empty($config[ 'default' ][ 'username' ])) {
+            if (!empty($config['default']['hostname']) AND !empty($config['default']['username'])) {
 
-                if(profiler() !== false) {
+                if (profiler() !== false) {
                     profiler()->watch('Starting Database Service');
                 }
 
@@ -70,7 +70,7 @@ 
 
         if (isset($service) && $service instanceof SplServiceRegistry) {
             if (profiler() !== false) {
-                profiler()->watch('Load New Model: ' . $service->getClassName());
+                profiler()->watch('Load New Model: '.$service->getClassName());
             }
 
             $this->register($service, $offset);
@@ -88,13 +88,13 @@ 
     public function add($model, $offset = null)
     {
         if (is_object($service)) {
-            if ( ! $service instanceof SplServiceRegistry) {
+            if (!$service instanceof SplServiceRegistry) {
                 $service = new SplServiceRegistry($service);
             }
         }
 
         if (profiler() !== false) {
-            profiler()->watch('Add New Model: ' . $service->getClassName());
+            profiler()->watch('Add New Model: '.$service->getClassName());
         }
 
         $this->register($service, $offset);
@@ -122,7 +122,7 @@ 
                 $this->attach($offset, $service);
 
                 if (profiler() !== false) {
-                    profiler()->watch('Register New Model: ' . $service->getClassName());
+                    profiler()->watch('Register New Model: '.$service->getClassName());
                 }
             }
         }