o2system / framework

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/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 @@ 
     protected 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->softDelete($id);
+            $affectedRows[$id] = $this->softDelete($id);
         }
 
         return $affectedRows;
@@ -354,7 +354,7 @@ 
         $affectedRows = [];
 
         foreach ($ids as $id) {
-            $affectedRows[ $id ] = $this->softDeleteBy($id, $where);
+            $affectedRows[$id] = $this->softDeleteBy($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/Traits/HierarchicalTrait.php

Spacing +4 added lines, -4 removed lines

@@ -85,7 +85,7 @@ 
                         ]);
                 }
 
-                $update[ 'id' ] = $row->id;
+                $update['id'] = $row->id;
 
                 if ($this->hasChilds($row->id)) {
                     $right = $this->rebuildTree($row->id, $right, $depth + 1);
@@ -95,7 +95,7 @@ 
                         ->update($update = [
                             'record_right' => $right,
                         ]);
-                    $update[ 'id' ] = $row->id;
+                    $update['id'] = $row->id;
                 }
 
                 $i++;
@@ -193,7 +193,7 @@ 
     {
         $childs = [];
 
-        if($result = $this->qb
+        if ($result = $this->qb
             ->table($this->table)
             ->where('id_parent', $idParent)
             ->get()) {
@@ -221,7 +221,7 @@ 
      */
     protected function getNumChilds($idParent)
     {
-        if($result = $this->qb
+        if ($result = $this->qb
             ->table($this->table)
             ->select('id')
             ->where('id_parent', $idParent)

src/Models/Sql/Model.php

Spacing +3 added lines, -3 removed lines

@@ -163,7 +163,7 @@ 
                 if ($filepath === $filePath) {
                     continue;
                 }
-                $this->validSubModels[ camelcase(pathinfo($filepath, PATHINFO_FILENAME)) ] = $filepath;
+                $this->validSubModels[camelcase(pathinfo($filepath, PATHINFO_FILENAME))] = $filepath;
             }
         }
     }
@@ -210,7 +210,7 @@ 
             }
         }
 
-        if (empty($get[ $property ])) {
+        if (empty($get[$property])) {
             if (services()->has($property)) {
                 return services()->get($property);
             } elseif ($this->hasSubModel($property)) {
@@ -251,7 +251,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;

src/Http/View.php

Spacing +10 added lines, -10 removed lines

@@ -74,7 +74,7 @@ 
         );
 
         if ($this->config->offsetExists('extensions')) {
-            $this->setFileExtensions($this->config[ 'extensions' ]);
+            $this->setFileExtensions($this->config['extensions']);
         }
 
         $this->document = new Html\Document();
@@ -90,13 +90,13 @@ 
      */
     public function &__get($property)
     {
-        $get[ $property ] = false;
+        $get[$property] = false;
 
         if (property_exists($this, $property)) {
             return $this->{$property};
         }
 
-        return $get[ $property ];
+        return $get[$property];
     }
 
     public function parse($string, array $vars = [])
@@ -153,8 +153,8 @@ 
             $error = new ErrorException(
                 'E_VIEW_NOT_FOUND',
                 0,
-                @$backtrace[ 0 ][ 'file' ],
-                @$backtrace[ 0 ][ 'line' ],
+                @$backtrace[0]['file'],
+                @$backtrace[0]['line'],
                 [trim($filename)]
             );
 
@@ -300,7 +300,7 @@ 
 
     public function render(array $options = [])
     {
-        if(profiler() !== false) {
+        if (profiler() !== false) {
             profiler()->watch('Starting View Rendering');
         }
         
@@ -405,9 +405,9 @@ 
         if ($this->config->output['uglify'] === true) {
             $htmlOutput = preg_replace(
                 [
-                    '/\>[^\S ]+/s',     // strip whitespaces after tags, except space
-                    '/[^\S ]+\</s',     // strip whitespaces before tags, except space
-                    '/(\s)+/s',         // shorten multiple whitespace sequences
+                    '/\>[^\S ]+/s', // strip whitespaces after tags, except space
+                    '/[^\S ]+\</s', // strip whitespaces before tags, except space
+                    '/(\s)+/s', // shorten multiple whitespace sequences
                     '/<!--(.|\s)*?-->/', // Remove HTML comments
                     '/<!--(.*)-->/Uis',
                     "/[[:blank:]]+/",
@@ -429,7 +429,7 @@ 
             $htmlOutput = $beautifier->format($htmlOutput);
         }
 
-        if(profiler() !== false) {
+        if (profiler() !== false) {
             profiler()->watch('Ending View Rendering');
         }
 

src/Http/Controller.php

Spacing +6 added lines, -6 removed lines

@@ -24,7 +24,7 @@ 
 {
     public function &__get($property)
     {
-        $get[ $property ] = false;
+        $get[$property] = false;
 
         // CodeIgniter property aliasing
         if ($property === 'load') {
@@ -32,15 +32,15 @@ 
         }
 
         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];
     }
 }
\ No newline at end of file

src/Http/Input.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     protected function filter($type, $offset = null, $filter = FILTER_DEFAULT)
     {
         if (services()->has('xssProtection')) {
-            if (!services()->get('xssProtection')->verify()) {
+            if ( ! services()->get('xssProtection')->verify()) {
                 $string = parent::filter($type, $offset, $filter);
 
                 if (is_string($string)) {

src/Http/Middleware/Csrf.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     {
         if (services()->has('csrfProtection')) {
             if (hash_equals(input()->server('REQUEST_METHOD'), 'POST')) {
-                if (!services()->get('csrfProtection')->verify()) {
+                if ( ! services()->get('csrfProtection')->verify()) {
                     output()->sendError(403, [
                         'message' => language()->getLine('403_INVALID_CSRF')
                     ]);

src/Http/Presenter/Page.php

Spacing +13 added lines, -13 removed lines

@@ -33,12 +33,12 @@ 
     {
         // Create Page breadcrumbs
         $breadcrumb = new Breadcrumb();
-        $breadcrumb->createList( new Link( language()->getLine( 'HOME' ), base_url() ) );
-        $this->store( 'breadcrumb', $breadcrumb );
+        $breadcrumb->createList(new Link(language()->getLine('HOME'), base_url()));
+        $this->store('breadcrumb', $breadcrumb);
 
         // Store Page Uri
         $uri = new Uri();
-        $this->store( 'uri', $uri );
+        $this->store('uri', $uri);
     }
 
     // ------------------------------------------------------------------------
@@ -50,12 +50,12 @@ 
      *
      * @return static
      */
-    public function setHeader( $header )
+    public function setHeader($header)
     {
-        $header = trim( $header );
-        $this->store( 'header', $header );
-        presenter()->meta->offsetSet( 'subtitle', $header );
-        presenter()->meta->title->append( $header );
+        $header = trim($header);
+        $this->store('header', $header);
+        presenter()->meta->offsetSet('subtitle', $header);
+        presenter()->meta->title->append($header);
 
         return $this;
     }
@@ -69,9 +69,9 @@ 
      *
      * @return static
      */
-    public function setSubHeader( $subHeader )
+    public function setSubHeader($subHeader)
     {
-        $this->store( 'subHeader', trim( $subHeader ) );
+        $this->store('subHeader', trim($subHeader));
 
         return $this;
     }
@@ -85,10 +85,10 @@ 
      *
      * @return static
      */
-    public function setDescription( $description )
+    public function setDescription($description)
     {
-        $description = trim( $description );
-        $this->store( 'description', $description );
+        $description = trim($description);
+        $this->store('description', $description);
 
         return $this;
     }