o2system / framework

src/Models/Sql/Traits/ModifierTrait.php

Spacing +37 added lines, -37 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);
             }
         }
 
@@ -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);
             }
         }
 
@@ -188,7 +188,7 @@ 
             return $this->db->getLastInsertId();
         }
 
-        return $result[ 0 ]->id;
+        return $result[0]->id;
     }
 
     protected function updateOrInsert(array $sets, array $where = [])
@@ -197,10 +197,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];
                 }
             }
         }
@@ -227,11 +227,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];
             }
         }
 
@@ -243,8 +243,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);
                 }
             }
         }
@@ -278,7 +278,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->softDelete($id);
+            $affectedRows[$id] = $this->softDelete($id);
         }
 
         return $affectedRows;
@@ -301,19 +301,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
@@ -347,7 +347,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->softDeleteBy($id, $where);
+            $affectedRows[$id] = $this->softDeleteBy($id, $where);
         }
 
         return $affectedRows;
@@ -369,7 +369,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->delete($id, $force);
+            $affectedRows[$id] = $this->delete($id, $force);
         }
 
         return $affectedRows;
@@ -383,13 +383,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
@@ -418,7 +418,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->deleteBy($id, $where, $force);
+            $affectedRows[$id] = $this->deleteBy($id, $where, $force);
         }
 
         return $affectedRows;
@@ -448,19 +448,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
@@ -517,7 +517,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->publish($id);
+            $affectedRows[$id] = $this->publish($id);
         }
 
         return $affectedRows;
@@ -537,7 +537,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->publishBy($id, $where);
+            $affectedRows[$id] = $this->publishBy($id, $where);
         }
 
         return $affectedRows;

src/Models/Sql/DataObjects/Result.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,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/Files/Model.php

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
             }
 
             $first = reset($this->storage);
-            if ( ! isset($first[ $this->primaryKey ])) {
+            if ( ! isset($first[$this->primaryKey])) {
                 $keys = $first->getKeys();
                 $this->primaryKey = reset($keys);
             }
@@ -89,7 +89,7 @@ 
      */
     public function get($property)
     {
-        if (empty($get[ $property ])) {
+        if (empty($get[$property])) {
             if (services()->has($property)) {
                 return services()->get($property);
             } elseif (array_key_exists($property, $this->validSubModels)) {
@@ -113,7 +113,7 @@ 
      */
     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/Helpers/Framework.php

Spacing +8 added lines, -8 removed lines

@@ -67,8 +67,8 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            if (isset($GLOBALS[ $args[ 0 ] ])) {
-                return $GLOBALS[ $args[ 0 ] ];
+            if (isset($GLOBALS[$args[0]])) {
+                return $GLOBALS[$args[0]];
             }
 
             return null;
@@ -93,8 +93,8 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            if (isset($_ENV[ $args[ 0 ] ])) {
-                return $_ENV[ $args[ 0 ] ];
+            if (isset($_ENV[$args[0]])) {
+                return $_ENV[$args[0]];
             }
 
             return null;
@@ -195,7 +195,7 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            return o2system()->models->get($args[ 0 ]);
+            return o2system()->models->get($args[0]);
         }
 
         return o2system()->models;
@@ -217,7 +217,7 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            return o2system()->modules->getModule($args[ 0 ]);
+            return o2system()->modules->getModule($args[0]);
         }
 
         return o2system()->modules;
@@ -259,8 +259,8 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            if (isset($_SESSION[ $args[ 0 ] ])) {
-                return $_SESSION[ $args[ 0 ] ];
+            if (isset($_SESSION[$args[0]])) {
+                return $_SESSION[$args[0]];
             }
 
             return null;

src/Helpers/Url.php

Spacing +9 added lines, -9 removed lines

@@ -26,9 +26,9 @@ 
             ->withQuery('');
 
         if ($uriConfig = config()->offsetGet('uri')) {
-            if ( ! empty($uriConfig[ 'base' ])) {
+            if ( ! empty($uriConfig['base'])) {
                 $base = (is_https() ? 'https' : 'http') . '://' . str_replace(['http://', 'https://'], '',
-                        $uriConfig[ 'base' ]);
+                        $uriConfig['base']);
                 $uri = new \O2System\Kernel\Http\Message\Uri($base);
             }
         }
@@ -64,9 +64,9 @@ 
             ->withQuery('');
 
         if ($uriConfig = config()->offsetGet('uri')) {
-            if ( ! empty($uriConfig[ 'base' ])) {
+            if ( ! empty($uriConfig['base'])) {
                 $base = (is_https() ? 'https' : 'http') . '://' . str_replace(['http://', 'https://'], '',
-                        $uriConfig[ 'base' ]);
+                        $uriConfig['base']);
                 $uri = new \O2System\Kernel\Http\Message\Uri($base);
             }
         }
@@ -196,7 +196,7 @@ 
 
         $url = parse_url($uri);
 
-        if ( ! $url or ! isset($url[ 'scheme' ])) {
+        if ( ! $url or ! isset($url['scheme'])) {
             return (is_https() ? 'https://' : 'http://') . $uri;
         }
 
@@ -232,15 +232,15 @@ 
         }
 
         // IIS environment likely? Use 'refresh' for better compatibility
-        if ($method === 'auto' && isset($_SERVER[ 'SERVER_SOFTWARE' ]) && strpos(
-                $_SERVER[ 'SERVER_SOFTWARE' ],
+        if ($method === 'auto' && isset($_SERVER['SERVER_SOFTWARE']) && strpos(
+                $_SERVER['SERVER_SOFTWARE'],
                 'Microsoft-IIS'
             ) !== false
         ) {
             $method = 'refresh';
         } elseif ($method !== 'refresh' && (empty($code) OR ! is_numeric($code))) {
-            if (isset($_SERVER[ 'SERVER_PROTOCOL' ], $_SERVER[ 'REQUEST_METHOD' ]) && $_SERVER[ 'SERVER_PROTOCOL' ] === 'HTTP/1.1') {
-                $code = ($_SERVER[ 'REQUEST_METHOD' ] !== 'GET')
+            if (isset($_SERVER['SERVER_PROTOCOL'], $_SERVER['REQUEST_METHOD']) && $_SERVER['SERVER_PROTOCOL'] === 'HTTP/1.1') {
+                $code = ($_SERVER['REQUEST_METHOD'] !== 'GET')
                     ? 303    // reference: http://en.wikipedia.org/wiki/Post/Redirect/Get
                     : 307;
             } else {

src/Http/Output.php

Spacing +7 added lines, -7 removed lines

@@ -133,7 +133,7 @@ 
         $error = new ErrorException($errorMessage, $errorSeverity, $errorFile, $errorLine, $errorContext);
 
         // Logged the error
-        if(services()->has('logger')) {
+        if (services()->has('logger')) {
             logger()->error(
                 implode(
                     ' ',
@@ -284,21 +284,21 @@ 
         ];
 
         $this->statusCode = $code;
-        $this->reasonPhrase = $error[ 'title' ];
+        $this->reasonPhrase = $error['title'];
 
         if (is_string($vars)) {
             $vars = ['message' => $vars];
-        } elseif (is_array($vars) and empty($vars[ 'message' ])) {
-            $vars[ 'message' ] = $error[ 'message' ];
+        } elseif (is_array($vars) and empty($vars['message'])) {
+            $vars['message'] = $error['message'];
         }
 
-        if (isset($vars[ 'message' ])) {
-            $error[ 'message' ] = $vars[ 'message' ];
+        if (isset($vars['message'])) {
+            $error['message'] = $vars['message'];
         }
 
         if (is_ajax() or $this->mimeType !== 'text/html') {
             $this->statusCode = $code;
-            $this->reasonPhrase = $error[ 'title' ];
+            $this->reasonPhrase = $error['title'];
             $this->send($vars);
 
             exit(EXIT_ERROR);

src/Cli/Commanders/Make/Module.php

Spacing +3 added lines, -3 removed lines

@@ -100,7 +100,7 @@ 
             exit(EXIT_ERROR);
         }
 
-        $jsonProperties[ 'name' ] = readable(
+        $jsonProperties['name'] = readable(
             pathinfo($modulePath, PATHINFO_FILENAME),
             true
         );
@@ -113,10 +113,10 @@ 
                 ) . '\\';
         } else {
             $namespace = $this->namespace;
-            $jsonProperties[ 'namespace' ] = rtrim($namespace, '\\') . '\\';
+            $jsonProperties['namespace'] = rtrim($namespace, '\\') . '\\';
         }
 
-        $jsonProperties[ 'created' ] = date('d M Y');
+        $jsonProperties['created'] = date('d M Y');
 
         loader()->addNamespace($namespace, $modulePath);
 

src/Libraries/Ui/Admin/Sidebar/Menu.php

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
     {
         parent::__construct('div');
 
-        if (isset($attributes[ 'id' ])) {
-            $this->entity->setEntityName($attributes[ 'id' ]);
+        if (isset($attributes['id'])) {
+            $this->entity->setEntityName($attributes['id']);
         }
 
         if (count($attributes)) {

src/Libraries/Ui/Admin/Sidebar.php

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
     {
         parent::__construct('div');
 
-        if (isset($attributes[ 'id' ])) {
-            $this->entity->setEntityName($attributes[ 'id' ]);
+        if (isset($attributes['id'])) {
+            $this->entity->setEntityName($attributes['id']);
         }
 
         if (count($attributes)) {