o2system / framework

src/Libraries/AccessControl/User.php

Indentation +18 added lines, -18 removed lines

@@ -275,15 +275,15 @@ 
                             } elseif ($authority->first()->permission === 'GRANTED') {
                                 // Access only granted cannot do modifier access
                                 foreach ([
-                                             'form',
-                                             'add',
-                                             'add-as-new',
-                                             'edit',
-                                             'update',
-                                             'insert',
-                                             'create',
-                                             'delete',
-                                         ] as $segment
+                                                'form',
+                                                'add',
+                                                'add-as-new',
+                                                'edit',
+                                                'update',
+                                                'insert',
+                                                'create',
+                                                'delete',
+                                            ] as $segment
                                 ) {
                                     if (in_array($segment, $segments)) {
                                         return false;
@@ -303,15 +303,15 @@ 
                             } elseif ($authority->first()->permission === 'GRANTED') {
                                 // Access only granted cannot do modifier access
                                 foreach ([
-                                             'form',
-                                             'add',
-                                             'add-as-new',
-                                             'edit',
-                                             'update',
-                                             'insert',
-                                             'create',
-                                             'delete',
-                                         ] as $segment
+                                                'form',
+                                                'add',
+                                                'add-as-new',
+                                                'edit',
+                                                'update',
+                                                'insert',
+                                                'create',
+                                                'delete',
+                                            ] as $segment
                                 ) {
                                     if (in_array($segment, $segments)) {
                                         return false;

Spacing +9 added lines, -9 removed lines

@@ -99,10 +99,10 @@ 
             if (isset($account)) {
                 foreach ($account as $key => $value) {
                     if (strpos($key, 'record') !== false) {
-                        unset($account[ $key ]);
+                        unset($account[$key]);
                     } elseif (in_array($key,
                         ['password', 'pin', 'token', 'sso', 'id_sys_user', 'id_sys_module', 'id_sys_module_role'])) {
-                        unset($account[ $key ]);
+                        unset($account[$key]);
                     }
                 }
 
@@ -131,7 +131,7 @@ 
             $column = 'id';
         } elseif (filter_var($username, FILTER_VALIDATE_EMAIL)) {
             $column = 'email';
-        } elseif (preg_match($this->config[ 'msisdnRegex' ], $username)) {
+        } elseif (preg_match($this->config['msisdnRegex'], $username)) {
             $column = 'msisdn';
         }
 
@@ -155,7 +155,7 @@ 
     public function loggedIn()
     {
         if (parent::loggedIn()) {
-            if(is_object($_SESSION['account'])) {
+            if (is_object($_SESSION['account'])) {
                 $account = new Account($_SESSION['account']->getArrayCopy());
                 $username = $account->user->username;
             } else {
@@ -211,7 +211,7 @@ 
             $column = 'id';
         } elseif (filter_var($username, FILTER_VALIDATE_EMAIL)) {
             $column = 'email';
-        } elseif (preg_match($this->config[ 'msisdnRegex' ], $username)) {
+        } elseif (preg_match($this->config['msisdnRegex'], $username)) {
             $column = 'msisdn';
         } elseif (strpos($username, 'token-') !== false) {
             $username = str_replace('token-', '', $username);
@@ -226,15 +226,15 @@ 
 
             foreach ($account as $key => $value) {
                 if (strpos($key, 'record') !== false) {
-                    unset($account[ $key ]);
+                    unset($account[$key]);
                 } elseif (in_array($key, ['password', 'pin', 'token', 'sso'])) {
-                    unset($account[ $key ]);
+                    unset($account[$key]);
                 }
             }
 
             if ($column === 'token') {
                 models('users')->update([
-                    'id'    => $account[ 'id' ],
+                    'id'    => $account['id'],
                     'token' => null,
                 ]);
             }
@@ -386,7 +386,7 @@ 
     public function getIframeCode()
     {
         if ($this->signedOn() && $this->loggedIn() === false) {
-            return '<iframe id="sign-on-iframe" width="1" height="1" src="' . rtrim($this->config[ 'sso' ][ 'server' ],
+            return '<iframe id="sign-on-iframe" width="1" height="1" src="' . rtrim($this->config['sso']['server'],
                     '/') . '" style="display: none; visibility: hidden;"></iframe>';
         }
 

src/Cli/Commanders/Make/App.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/Models/Sql/DataObjects/Result/Row.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
     {
         if ($this->offsetExists($offset)) {
             return parent::offsetGet($offset);
-        } elseif(strpos($offset, 'record') !== false) {
+        } elseif (strpos($offset, 'record') !== false) {
             switch ($offset) {
                 case 'record':
                     return $this->record;

src/Models/Sql/Model.php

Spacing +5 added lines, -5 removed lines

@@ -276,7 +276,7 @@ 
                 if ($filepath === $filePath) {
                     continue;
                 }
-                $this->validSubModels[ camelcase(pathinfo($filepath, PATHINFO_FILENAME)) ] = $filepath;
+                $this->validSubModels[camelcase(pathinfo($filepath, PATHINFO_FILENAME))] = $filepath;
             }
         }
     }
@@ -344,7 +344,7 @@ 
             }
         }
 
-        if (empty($get[ $property ])) {
+        if (empty($get[$property])) {
             if (services()->has($property)) {
                 return services()->get($property);
             } elseif ($this->hasSubModel($property)) {
@@ -371,7 +371,7 @@ 
     final protected 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;
@@ -432,7 +432,7 @@ 
      */
     final public function rebuildRowCallback(\Closure $callback)
     {
-        if(empty($this->rebuildRowCallback)) {
+        if (empty($this->rebuildRowCallback)) {
             $this->rebuildRowCallback = $callback;
         }
     }
@@ -472,7 +472,7 @@ 
      */
     public function rebuildRow($row)
     {
-        if(is_callable($this->rebuildRowCallback)) {
+        if (is_callable($this->rebuildRowCallback)) {
             call_user_func($this->rebuildRowCallback, $row);
         }
     }

src/Http/Controllers/Restful.php

Spacing +33 added lines, -33 removed lines

@@ -338,8 +338,8 @@ 
                         $conditions = [];
 
                         foreach ($this->paramsWithRules as $param) {
-                            if ($get->offsetExists($param[ 'field' ])) {
-                                $conditions[ $param[ 'field' ] ] = $get->offsetGet($param[ 'field' ]);
+                            if ($get->offsetExists($param['field'])) {
+                                $conditions[$param['field']] = $get->offsetGet($param['field']);
                             }
                         }
 
@@ -395,7 +395,7 @@ 
             }
 
             $hasAction = false;
-            if($request = input()->request()) {
+            if ($request = input()->request()) {
                 // Start as limit
                 $this->model->qb->limit($request['start']);
 
@@ -403,8 +403,8 @@ 
                 $this->model->qb->offset($request['length']);
 
                 // Set ordering
-                if( ! empty($request['order'])) {
-                    foreach($request['order'] as $dt => $order) {
+                if ( ! empty($request['order'])) {
+                    foreach ($request['order'] as $dt => $order) {
                         $field = $request['columns'][$order['column']]['data'];
                         $this->model->qb->orderBy($field, strtoupper($order['dir']));
                     }
@@ -412,30 +412,30 @@ 
 
                 $this->model->visibleColumns = [];
 
-                foreach($request['columns'] as $dt => $column) {
-                    if($column['data'] === 'action') {
+                foreach ($request['columns'] as $dt => $column) {
+                    if ($column['data'] === 'action') {
                         $this->model->appendColumns[] = 'action';
 
                         continue;
                     }
 
-                    if($column['searchable']) {
-                        if($dt == 0) {
-                            if( ! empty($column['search']['value']) ) {
+                    if ($column['searchable']) {
+                        if ($dt == 0) {
+                            if ( ! empty($column['search']['value'])) {
                                 $this->model->qb->like($column['data'], $column['search']['value']);
 
-                                if( ! empty($request['search']['value'])) {
+                                if ( ! empty($request['search']['value'])) {
                                     $this->model->qb->orLike($column['data'], $request['search']['value']);
                                 }
-                            } elseif( ! empty($request['search']['value'])) {
+                            } elseif ( ! empty($request['search']['value'])) {
                                 $this->model->qb->like($column['data'], $request['search']['value']);
                             }
                         } else {
-                            if( ! empty($column['search']['value']) ) {
-                                $this->model->qb->orLike($column[ 'data' ], $column[ 'search' ][ 'value' ]);
+                            if ( ! empty($column['search']['value'])) {
+                                $this->model->qb->orLike($column['data'], $column['search']['value']);
                             }
 
-                            if( ! empty($request['search']['value'])) {
+                            if ( ! empty($request['search']['value'])) {
                                 $this->model->qb->orLike($column['data'], $request['search']['value']);
                             }
                         }
@@ -445,7 +445,7 @@ 
                 }
             }
 
-            $this->model->rebuildRowCallback(function ($row) {
+            $this->model->rebuildRowCallback(function($row) {
                 $row->DT_RowId = 'datatable-row-' . $row->id;
             });
 
@@ -489,14 +489,14 @@ 
 
             if (count($this->fillableColumnsWithRules)) {
                 foreach ($this->fillableColumnsWithRules as $column) {
-                    if ($post->offsetExists($column[ 'field' ])) {
-                        $data[ $column[ 'field' ] ] = $post->offsetGet($column[ 'field' ]);
+                    if ($post->offsetExists($column['field'])) {
+                        $data[$column['field']] = $post->offsetGet($column['field']);
                     }
                 }
             } elseif (count($this->fillableColumns)) {
                 foreach ($this->fillableColumns as $column) {
-                    if ($post->offsetExists($column[ 'field' ])) {
-                        $data[ $column[ 'field' ] ] = $post->offsetGet($column[ 'field' ]);
+                    if ($post->offsetExists($column['field'])) {
+                        $data[$column['field']] = $post->offsetGet($column['field']);
                     }
                 }
             } else {
@@ -504,11 +504,11 @@ 
             }
 
             if (count($data)) {
-                $data[ 'record_create_timestamp' ] = $data[ 'record_update_timestamp' ] = timestamp();
-                $data[ 'record_create_user' ] = $data[ 'record_update_user' ] = globals()->account->id;
+                $data['record_create_timestamp'] = $data['record_update_timestamp'] = timestamp();
+                $data['record_create_user'] = $data['record_update_user'] = globals()->account->id;
 
                 if ($this->model->insert($data)) {
-                    $data[ 'id' ] = $this->model->db->getLastInsertId();
+                    $data['id'] = $this->model->db->getLastInsertId();
                     $this->sendPayload([
                         'code' => 201,
                         'Successful insert request',
@@ -567,14 +567,14 @@ 
 
             if (count($this->fillableColumnsWithRules)) {
                 foreach ($this->fillableColumnsWithRules as $column) {
-                    if ($post->offsetExists($column[ 'field' ])) {
-                        $data[ $column[ 'field' ] ] = $post->offsetGet($column[ 'field' ]);
+                    if ($post->offsetExists($column['field'])) {
+                        $data[$column['field']] = $post->offsetGet($column['field']);
                     }
                 }
             } elseif (count($this->fillableColumns)) {
                 foreach ($this->fillableColumns as $column) {
-                    if ($post->offsetExists($column[ 'field' ])) {
-                        $data[ $column[ 'field' ] ] = $post->offsetGet($column[ 'field' ]);
+                    if ($post->offsetExists($column['field'])) {
+                        $data[$column['field']] = $post->offsetGet($column['field']);
                     }
                 }
             } else {
@@ -582,8 +582,8 @@ 
             }
 
             if (count($data)) {
-                $data[ 'record_update_timestamp' ] = timestamp();
-                $data[ 'record_update_user' ] = globals()->account->id;
+                $data['record_update_timestamp'] = timestamp();
+                $data['record_update_user'] = globals()->account->id;
 
 
                 if ($this->model->update($data, $conditions)) {
@@ -743,9 +743,9 @@ 
             if (is_numeric(key($code))) {
                 $message = reset($code);
                 $code = key($code);
-            } elseif (isset($code[ 'code' ])) {
-                $code = $code[ 'code' ];
-                $message = $code[ 'message' ];
+            } elseif (isset($code['code'])) {
+                $code = $code['code'];
+                $message = $code['message'];
             }
         }
 
@@ -813,7 +813,7 @@ 
                 $longPoolingCacheMetadata = $longPoolingCacheData->getMetadata();
 
                 // if no timestamp delivered via ajax or data.txt has been changed SINCE last ajax timestamp
-                if ($lastCallTimestamp == null || $longPoolingCacheMetadata[ 'ctime' ] > $lastCallTimestamp) {
+                if ($lastCallTimestamp == null || $longPoolingCacheMetadata['ctime'] > $lastCallTimestamp) {
                     output()->send([
                         'timestamp' => $longPoolingCacheMetadata,
                         'data'      => $data,

src/Models/Sql/DataObjects/Result.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
      */
     public function offsetSet($offset, $row)
     {
-        if($model = models($this->model->getClass())) {
+        if ($model = models($this->model->getClass())) {
             $row = new Result\Row($row, $model);
         }
 

src/Libraries/Ui/Contents/Lists/Abstracts/AbstractList.php

Spacing +6 added lines, -6 removed lines

@@ -134,20 +134,20 @@
                 $parseUrl = parse_url($node->childNodes->first()->getAttributeHref());
                 $parseUrlQuery = [];
 
-                if (isset($parseUrl[ 'query' ])) {
-                    parse_str($parseUrl[ 'query' ], $parseUrlQuery);
+                if (isset($parseUrl['query'])) {
+                    parse_str($parseUrl['query'], $parseUrlQuery);
                 }
 
-                if (isset($parseUrlQuery[ 'page' ])) {
-                    if (input()->get('page') === $parseUrlQuery[ 'page' ]) {
+                if (isset($parseUrlQuery['page'])) {
+                    if (input()->get('page') === $parseUrlQuery['page']) {
                         $node->attributes->addAttributeClass('active');
                         $node->childNodes->first()->attributes->addAttributeClass('active');
                     }
                 } else {
                     $hrefUriSegments = [];
 
-                    if (isset($parseUrl[ 'path' ])) {
-                        $hrefUriSegments = (new Uri\Segments($parseUrl[ 'path' ]))->getArrayCopy();
+                    if (isset($parseUrl['path'])) {
+                        $hrefUriSegments = (new Uri\Segments($parseUrl['path']))->getArrayCopy();
                     }
 
                     $currentUriSegments = server_request()->getUri()->segments->getArrayCopy();

src/Http/Controller.php

Spacing +6 added lines, -6 removed lines

@@ -42,7 +42,7 @@ 
      */
     public function &__get($property)
     {
-        $get[ $property ] = false;
+        $get[$property] = false;
 
         // CodeIgniter property aliasing
         if ($property === 'load') {
@@ -50,16 +50,16 @@ 
         }
 
         if (services()->has($property)) {
-            $get[ $property ] = services()->get($property);
+            $get[$property] = services()->get($property);
         } elseif (o2system()->__isset($property)) {
-            $get[ $property ] = o2system()->__get($property);
+            $get[$property] = o2system()->__get($property);
         } elseif ($property === 'model') {
-            $get[ $property ] = models('controller');
+            $get[$property] = models('controller');
         } elseif ($property === 'services' || $property === 'libraries') {
-            $get[ $property ] = services();
+            $get[$property] = services();
         }
 
-        return $get[ $property ];
+        return $get[$property];
     }
 
     // ------------------------------------------------------------------------

src/Cli/Commanders/Migrate.php

Spacing +36 added lines, -36 removed lines

@@ -330,7 +330,7 @@ 
                             'batch'     => $batch,
                         ];
 
-                        $this->insertOrUpdate($sets, ['filename' => $sets[ 'filename' ]]);
+                        $this->insertOrUpdate($sets, ['filename' => $sets['filename']]);
                     }
                 }
 
@@ -366,7 +366,7 @@ 
                     $timestamp = filemtime($filename);
                     preg_match('/\d{4}[-]?\d{2}[-]?\d{2}[-]?\d{2}[-]?\d{2}[-]?\d{2}/', $filename, $matches);
 
-                    $timestamp = count($matches) ? strtotime($matches[ 0 ]) : $timestamp;
+                    $timestamp = count($matches) ? strtotime($matches[0]) : $timestamp;
 
                     return date('Y-m-d H:i:s', $timestamp);
                 }
@@ -387,7 +387,7 @@ 
                     $version = 'v0.0.0';
                     preg_match('/v\d*[.]?\d*[.]\d*/', $filename, $matches);
 
-                    return count($matches) ? $matches[ 0 ] : $version;
+                    return count($matches) ? $matches[0] : $version;
                 }
 
                 // ------------------------------------------------------------------------
@@ -424,13 +424,13 @@ 
      */
     public function import()
     {
-        if( ! empty($this->optionSql)) {
-            $filePath = PATH_DATABASE . str_replace(['/','\\'], DIRECTORY_SEPARATOR, $this->optionSql);
+        if ( ! empty($this->optionSql)) {
+            $filePath = PATH_DATABASE . str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $this->optionSql);
 
-            if(is_file($filePath)) {
+            if (is_file($filePath)) {
                 $sqlStatement = file_get_contents($filePath);
 
-                if($this->model->db->query($sqlStatement)) {
+                if ($this->model->db->query($sqlStatement)) {
 
                 } else {
 
@@ -446,9 +446,9 @@ 
      */
     public function latest()
     {
-        if($result = $this->model->findWhere(['batch' => $this->model->getLatestBatch()])) {
-            if($result->count()) {
-                foreach($result as $row) {
+        if ($result = $this->model->findWhere(['batch' => $this->model->getLatestBatch()])) {
+            if ($result->count()) {
+                foreach ($result as $row) {
                     $this->run($row->filename, 'up');
                 }
             }
@@ -466,17 +466,17 @@ 
         $requestBatch = ($latestBatch - 1);
         $requestBatch = $requestBatch < 1 ? 1 : $requestBatch;
 
-        if( ! empty($this->optionBatch) ) {
+        if ( ! empty($this->optionBatch)) {
             $requestBatch = $this->optionBatch;
         }
 
         $batches = range($requestBatch, $latestBatch, 1);
         $batches = array_reverse($batches);
 
-        foreach($batches as $batch) {
-            if($result = $this->model->findWhere(['batch' => $batch])) {
-                if($result->count()) {
-                    foreach($result as $row) {
+        foreach ($batches as $batch) {
+            if ($result = $this->model->findWhere(['batch' => $batch])) {
+                if ($result->count()) {
+                    foreach ($result as $row) {
                         $this->run($row->filename, 'down');
                         $this->run($row->filename, 'up');
                     }
@@ -496,10 +496,10 @@ 
         $batches = range(1, $batch, 1);
         $batches = array_reverse($batches);
 
-        foreach($batches as $batch) {
-            if($result = $this->model->findWhere(['batch' => $batch])) {
-                if($result->count()) {
-                    foreach($result as $row) {
+        foreach ($batches as $batch) {
+            if ($result = $this->model->findWhere(['batch' => $batch])) {
+                if ($result->count()) {
+                    foreach ($result as $row) {
                         $this->run($row->filename, 'down');
                         $this->run($row->filename, 'up');
                     }
@@ -515,9 +515,9 @@ 
      */
     public function fresh()
     {
-        if($result = $this->model->findWhere(['batch' => 1])) {
-            if($result->count()) {
-                foreach($result as $row) {
+        if ($result = $this->model->findWhere(['batch' => 1])) {
+            if ($result->count()) {
+                foreach ($result as $row) {
                     $this->run($row->filename, 'up');
                 }
             }
@@ -538,13 +538,13 @@ 
     protected function run($filename, $method = 'up')
     {
         $filePaths = [
-            PATH_DATABASE . 'migrations' . DIRECTORY_SEPARATOR . str_replace(['/','\\'], DIRECTORY_SEPARATOR, $filename),
-            PATH_DATABASE . str_replace(['/','\\'], DIRECTORY_SEPARATOR, $filename)
+            PATH_DATABASE . 'migrations' . DIRECTORY_SEPARATOR . str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $filename),
+            PATH_DATABASE . str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $filename)
         ];
 
-        foreach($filePaths as $filePath) {
-            if(is_file($filePath)) {
-                if(pathinfo($filePath, PATHINFO_EXTENSION) == 'php') {
+        foreach ($filePaths as $filePath) {
+            if (is_file($filePath)) {
+                if (pathinfo($filePath, PATHINFO_EXTENSION) == 'php') {
                     require_once($filePath);
                     $filename = pathinfo($filePath, PATHINFO_FILENAME);
                     $filename = explode('_', $filename);
@@ -560,22 +560,22 @@ 
                             ->setNewLinesAfter(1)
                     );
 
-                    if(class_exists($className)) {
+                    if (class_exists($className)) {
                         $migration = new $className();
 
-                        if(method_exists($migration, $method)) {
+                        if (method_exists($migration, $method)) {
                             call_user_func([$migration, $method]);
 
                             output()->write(
                                 (new Format())
                                     ->setContextualClass(Format::SUCCESS)
-                                    ->setString(language()->getLine('CLI_MIGRATION_RUN_'.strtoupper($method).'_SUCCESS', [$filename]))
+                                    ->setString(language()->getLine('CLI_MIGRATION_RUN_' . strtoupper($method) . '_SUCCESS', [$filename]))
                                     ->setNewLinesAfter(1)
                             );
 
-                            if($method === 'up') {
-                                if(method_exists($migration, 'seed')) {
-                                    if($this->optionSeed) {
+                            if ($method === 'up') {
+                                if (method_exists($migration, 'seed')) {
+                                    if ($this->optionSeed) {
                                         call_user_func([$migration, 'seed']);
 
                                         output()->write(
@@ -589,10 +589,10 @@ 
                             }
                         }
                     }
-                } elseif(pathinfo($filePath, PATHINFO_EXTENSION) == 'sql') {
+                } elseif (pathinfo($filePath, PATHINFO_EXTENSION) == 'sql') {
                     $sqlStatement = file_get_contents($filePath);
 
-                    if($this->model->db->query($sqlStatement)) {
+                    if ($this->model->db->query($sqlStatement)) {
                         output()->write(
                             (new Format())
                                 ->setContextualClass(Format::SUCCESS)
@@ -621,7 +621,7 @@ 
      */
     public function execute()
     {
-        if($this->optionFilename) {
+        if ($this->optionFilename) {
             $this->run($this->optionFilename);
         }
     }