o2system / framework

src/Models/Options.php

Indentation +20 added lines, -20 removed lines

@@ -220,16 +220,16 @@ 
         $familyRelationships = [];
 
         foreach ([
-                     'PARENT',
-                     'CHILD',
-                     'SPOUSE',
-                     'SIBLING',
-                     'GRANDPARENTS',
-                     'GRANDCHILD',
-                     'PARENTS_SIBLING',
-                     'SIBLINGS_CHILD',
-                     'AUNTS_UNCLES_CHILD',
-                 ] as $relationship
+                        'PARENT',
+                        'CHILD',
+                        'SPOUSE',
+                        'SIBLING',
+                        'GRANDPARENTS',
+                        'GRANDCHILD',
+                        'PARENTS_SIBLING',
+                        'SIBLINGS_CHILD',
+                        'AUNTS_UNCLES_CHILD',
+                    ] as $relationship
         ) {
             $familyRelationships[ $relationship ] = $this->language->getLine($relationship);
         }
@@ -245,12 +245,12 @@ 
         $statuses = [];
 
         foreach ([
-                     'PUBLISH',
-                     'UNPUBLISH',
-                     'DRAFT',
-                     'ARCHIVED',
-                     'TRASH',
-                 ] as $status
+                        'PUBLISH',
+                        'UNPUBLISH',
+                        'DRAFT',
+                        'ARCHIVED',
+                        'TRASH',
+                    ] as $status
         ) {
             $statuses[ $status ] = $this->language->getLine($status);
         }
@@ -269,10 +269,10 @@ 
         $visibilities = [];
 
         foreach ([
-                     'PUBLIC',
-                     'PRIVATE',
-                     'MEMBER',
-                 ] as $visibility
+                        'PUBLIC',
+                        'PRIVATE',
+                        'MEMBER',
+                    ] as $visibility
         ) {
             $visibilities[ $visibility ] = $this->language->getLine($visibility);
         }

Spacing +15 added lines, -15 removed lines

@@ -40,7 +40,7 @@ 
         $religions = [];
 
         foreach (['ATHEIST', 'HINDU', 'BUDDHA', 'MOSLEM', 'CHRISTIAN', 'CATHOLIC', 'UNDEFINED'] as $religion) {
-            $religions[ $religion ] = $this->language->getLine($religion);
+            $religions[$religion] = $this->language->getLine($religion);
         }
 
         return $religions;
@@ -54,7 +54,7 @@ 
         $genders = [];
 
         foreach (['MALE', 'FEMALE', 'UNDEFINED'] as $gender) {
-            $genders[ $gender ] = $this->language->getLine($gender);
+            $genders[$gender] = $this->language->getLine($gender);
         }
 
         return $genders;
@@ -68,7 +68,7 @@ 
         $maritals = [];
 
         foreach (['SINGLE', 'MARRIED', 'DIVORCED', 'UNDEFINED'] as $marital) {
-            $maritals[ $marital ] = $this->language->getLine($marital);
+            $maritals[$marital] = $this->language->getLine($marital);
         }
 
         return $maritals;
@@ -82,7 +82,7 @@ 
         $bloodTypes = [];
 
         foreach (['A', 'B', 'AB', 'O', 'UNDEFINED'] as $bloodType) {
-            $bloodTypes[ $bloodType ] = $this->language->getLine($bloodType);
+            $bloodTypes[$bloodType] = $this->language->getLine($bloodType);
         }
 
         return $bloodTypes;
@@ -105,7 +105,7 @@ 
 
         for ($i = $start; $i <= $end; $i++) {
             $time = strtotime($year . 'W' . $week . $i);
-            $days[ strtoupper(date('D', $time)) ] = $this->language->getLine(
+            $days[strtoupper(date('D', $time))] = $this->language->getLine(
                 'CAL_' . strtoupper(date($labelFormat, $time)));
         }
 
@@ -126,7 +126,7 @@ 
             if ($leading) {
                 $date = strlen($date) == 1 ? '0' . $date : $date;
             }
-            $dates[ $date ] = $date;
+            $dates[$date] = $date;
         }
 
         return $dates;
@@ -148,7 +148,7 @@ 
             if ($leading) {
                 $month = strlen($month) == 1 ? '0' . $month : $month;
             }
-            $months[ $month ] = $this->language->getLine(strtoupper('CAL_' . date('F',
+            $months[$month] = $this->language->getLine(strtoupper('CAL_' . date('F',
                     strtotime('1-' . $month . '-2000'))));
         }
 
@@ -166,7 +166,7 @@ 
         $years = [];
 
         foreach (range($start, $end) as $year) {
-            $years[ $year ] = $year;
+            $years[$year] = $year;
         }
 
         return $years;
@@ -180,7 +180,7 @@ 
         $identities = [];
 
         foreach (['UNDEFINED', 'IDENTITY_CARD', 'STUDENT_CARD', 'DRIVER_LICENSE', 'PASSPORT'] as $identity) {
-            $identities[ $identity ] = $this->language->getLine($identity);
+            $identities[$identity] = $this->language->getLine($identity);
         }
 
         return $identities;
@@ -193,7 +193,7 @@ 
     {
         $sizes = [];
         foreach (['XS', 'S', 'M', 'L', 'XL', 'XXL', 'XXXL'] as $size) {
-            $sizes[ $size ] = $size;
+            $sizes[$size] = $size;
         }
 
         return $sizes;
@@ -206,7 +206,7 @@ 
     {
         $boolean = [];
         foreach (['YES', 'NO'] as $bool) {
-            $boolean[ $bool ] = $this->language->getLine('BOOL_' . $bool);
+            $boolean[$bool] = $this->language->getLine('BOOL_' . $bool);
         }
 
         return $boolean;
@@ -231,7 +231,7 @@ 
                      'AUNTS_UNCLES_CHILD',
                  ] as $relationship
         ) {
-            $familyRelationships[ $relationship ] = $this->language->getLine($relationship);
+            $familyRelationships[$relationship] = $this->language->getLine($relationship);
         }
 
         return $familyRelationships;
@@ -252,7 +252,7 @@ 
                      'TRASH',
                  ] as $status
         ) {
-            $statuses[ $status ] = $this->language->getLine($status);
+            $statuses[$status] = $this->language->getLine($status);
         }
 
         return $statuses;
@@ -274,7 +274,7 @@ 
                      'MEMBER',
                  ] as $visibility
         ) {
-            $visibilities[ $visibility ] = $this->language->getLine($visibility);
+            $visibilities[$visibility] = $this->language->getLine($visibility);
         }
 
         return $visibilities;
@@ -292,7 +292,7 @@ 
         $languages = [];
 
         foreach ($this->language->getRegistry() as $language) {
-            $languages[ $language->getParameter() ] = $language->getProperties()->name;
+            $languages[$language->getParameter()] = $language->getProperties()->name;
         }
 
         return $languages;

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 {