o2system / framework

src/Services/Loader.php

Spacing +20 added lines, -20 removed lines

@@ -141,20 +141,20 @@ 
 
         if (is_dir($baseDirectory)) {
             // initialize the namespace prefix array
-            if (isset($this->namespaceDirs[ $namespace ]) === false) {
-                $this->namespaceDirs[ $namespace ] = [];
+            if (isset($this->namespaceDirs[$namespace]) === false) {
+                $this->namespaceDirs[$namespace] = [];
             }
 
             // retain the base directory for the namespace prefix
-            if ( ! in_array($baseDirectory, $this->namespaceDirs[ $namespace ])) {
+            if ( ! in_array($baseDirectory, $this->namespaceDirs[$namespace])) {
                 if ($prepend) {
-                    array_unshift($this->namespaceDirs[ $namespace ], $baseDirectory);
+                    array_unshift($this->namespaceDirs[$namespace], $baseDirectory);
                 } else {
-                    array_push($this->namespaceDirs[ $namespace ], $baseDirectory);
+                    array_push($this->namespaceDirs[$namespace], $baseDirectory);
                 }
             }
 
-            $this->namespaceDirsMap[ $baseDirectory ] = $namespace;
+            $this->namespaceDirsMap[$baseDirectory] = $namespace;
 
             // Register Namespace Language
             language()->addFilePath($baseDirectory);
@@ -192,7 +192,7 @@ 
 
         if (is_dir($publicDir) and ! in_array($publicDir, $this->publicDirs)) {
             if (isset($offset)) {
-                $this->publicDirs[ $offset ] = $publicDir;
+                $this->publicDirs[$offset] = $publicDir;
             } else {
                 $this->publicDirs[] = $publicDir;
             }
@@ -217,7 +217,7 @@ 
 
         if (is_dir($resourcesDir) and ! in_array($resourcesDir, $this->resourcesDirs)) {
             if (isset($offset)) {
-                $this->resourcesDirs[ $offset ] = $resourcesDir;
+                $this->resourcesDirs[$offset] = $resourcesDir;
             } else {
                 $this->resourcesDirs[] = $resourcesDir;
             }
@@ -275,7 +275,7 @@ 
         $dir = rtrim($dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
 
         if (array_key_exists($dir, $this->namespaceDirsMap)) {
-            return $this->namespaceDirsMap[ $dir ];
+            return $this->namespaceDirsMap[$dir];
         }
 
         return false;
@@ -316,7 +316,7 @@ 
         $namespace = trim($namespace, '\\') . '\\';
 
         if (array_key_exists($namespace, $this->namespaceDirs)) {
-            return $this->namespaceDirs[ $namespace ];
+            return $this->namespaceDirs[$namespace];
         }
 
         return false;
@@ -339,7 +339,7 @@ 
         }
 
         if ($this->requireFile($helper)) {
-            $this->loadedHelpers[ pathinfo($helper, PATHINFO_FILENAME) ][] = $helper;
+            $this->loadedHelpers[pathinfo($helper, PATHINFO_FILENAME)][] = $helper;
 
             return;
         }
@@ -355,17 +355,17 @@ 
         }
 
         if ( ! array_key_exists($helper, $this->loadedHelpers)) {
-            $this->loadedHelpers[ $helper ] = [];
+            $this->loadedHelpers[$helper] = [];
         }
 
         foreach ($helperDirectories as $helperDirectory) {
 
             $helperFilePath = $helperDirectory . studlycase($helper) . '.php';
 
-            if (in_array($helperFilePath, $this->loadedHelpers[ $helper ])) {
+            if (in_array($helperFilePath, $this->loadedHelpers[$helper])) {
                 continue;
             } elseif ($this->requireFile($helperFilePath)) {
-                $this->loadedHelpers[ $helper ][] = $helperFilePath;
+                $this->loadedHelpers[$helper][] = $helperFilePath;
             }
         }
     }
@@ -396,7 +396,7 @@ 
             if (false !== ($modules = modules()->getRegistry())) {
                 foreach ($modules as $module) {
                     if ($module instanceof Module) {
-                        if (empty($this->namespaceDirs[ $module->getNamespace() ])) {
+                        if (empty($this->namespaceDirs[$module->getNamespace()])) {
                             $this->addNamespace($module->getNamespace(), $module->getRealPath());
                         }
                     }
@@ -458,12 +458,12 @@ 
     public function loadMappedFile($namespace, $relativeClass)
     {
         // are there any base directories for this namespace prefix?
-        if (isset($this->namespaceDirs[ $namespace ]) === false) {
+        if (isset($this->namespaceDirs[$namespace]) === false) {
             return false;
         }
 
         // look through base directories for this namespace prefix
-        foreach ($this->namespaceDirs[ $namespace ] as $namespaceDirectory) {
+        foreach ($this->namespaceDirs[$namespace] as $namespaceDirectory) {
 
             // replace the namespace prefix with the base directory,
             // replace namespace separators with directory separators
@@ -528,9 +528,9 @@ 
     public function services(array $classes)
     {
         foreach ($classes as $name => $class) {
-            if(is_numeric($name)) {
+            if (is_numeric($name)) {
                 services()->load($class);
-            } elseif(is_string($name)) {
+            } elseif (is_string($name)) {
                 services()->load($class, $name);
             }
         }
@@ -547,7 +547,7 @@ 
 
     public function models(array $models)
     {
-        foreach($models as $model) {
+        foreach ($models as $model) {
             models()->load($model);
         }
     }

src/Services/Language.php

Spacing +5 added lines, -5 removed lines

@@ -59,7 +59,7 @@ 
      */
     public function loadRegistry()
     {
-        if(empty($this->registry)) {
+        if (empty($this->registry)) {
             $cacheItemPool = cache()->getItemPool('default');
 
             if (cache()->hasItemPool('registry')) {
@@ -125,7 +125,7 @@ 
                             );
                         }
 
-                        $registry[ $package->getDirName() ] = $package;
+                        $registry[$package->getDirName()] = $package;
                     } elseif (is_cli()) {
                         output()->verbose(
                             (new Format())
@@ -155,7 +155,7 @@ 
      */
     public function registered($package)
     {
-        return isset($this->registry[ $package ]);
+        return isset($this->registry[$package]);
     }
 
     // ------------------------------------------------------------------------
@@ -171,7 +171,7 @@ 
     {
         if (isset($package)) {
             if ($this->registered($package)) {
-                return $this->registry[ $package ];
+                return $this->registry[$package];
             }
 
             return false;
@@ -182,7 +182,7 @@ 
 
     public function getDefaultMetadata()
     {
-        return $this->getRegistry( $this->getDefault() );
+        return $this->getRegistry($this->getDefault());
     }
 
     // ------------------------------------------------------------------------

src/Models/Files/Model.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
             }
 
             $first = reset($this->storage);
-            if ( ! isset($first[ $this->primaryKey ])) {
+            if ( ! isset($first[$this->primaryKey])) {
                 $keys = $first->getKeys();
                 $this->primaryKey = reset($keys);
             }
@@ -48,7 +48,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)) {
@@ -63,7 +63,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/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 (services()->has($property)) {
-            $get[ $property ] = services()->get($property);
+            $get[$property] = services()->get($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/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');
         }