o2system / framework

src/Services/Cart.php

Spacing +24 added lines, -24 removed lines

@@ -29,11 +29,11 @@ 
      */
     public function __construct()
     {
-        if (empty($_SESSION[ 'o2system' ][ 'cart' ])) {
-            $_SESSION[ 'o2system' ][ 'cart' ] = [];
+        if (empty($_SESSION['o2system']['cart'])) {
+            $_SESSION['o2system']['cart'] = [];
         }
 
-        $this->storage =& $_SESSION[ 'o2system' ][ 'cart' ];
+        $this->storage = & $_SESSION['o2system']['cart'];
     }
 
     // ------------------------------------------------------------------------
@@ -56,29 +56,29 @@ 
         ], $item);
 
         // set sku
-        $sku = empty($item[ 'sku' ]) ? $item[ 'id' ] : $item[ 'sku' ];
+        $sku = empty($item['sku']) ? $item['id'] : $item['sku'];
 
         // set sub-total
-        $item[ 'subTotal' ][ 'price' ] = $item[ 'price' ] * $item[ 'quantity' ];
-        $item[ 'subTotal' ][ 'discount' ] = 0;
+        $item['subTotal']['price'] = $item['price'] * $item['quantity'];
+        $item['subTotal']['discount'] = 0;
 
-        if (is_numeric($item[ 'discount' ])) {
-            $item[ 'subTotal' ][ 'discount' ] = $item[ 'subTotal' ][ 'price' ] - $item[ 'discount' ];
-        } elseif (is_string($item[ 'discount' ]) && strpos($item[ 'discount' ], '+') !== false) {
-            $discounts = explode('+', $item[ 'discount' ]);
+        if (is_numeric($item['discount'])) {
+            $item['subTotal']['discount'] = $item['subTotal']['price'] - $item['discount'];
+        } elseif (is_string($item['discount']) && strpos($item['discount'], '+') !== false) {
+            $discounts = explode('+', $item['discount']);
             if (count($discounts)) {
-                $item[ 'subTotal' ][ 'discount' ] = $item[ 'subTotal' ][ 'price' ] * (intval(reset($discounts)) / 100);
+                $item['subTotal']['discount'] = $item['subTotal']['price'] * (intval(reset($discounts)) / 100);
                 foreach (array_slice($discounts, 1) as $discount) {
-                    $item[ 'subTotal' ][ 'discount' ] += $item[ 'subTotal' ][ 'discount' ] * (intval($discount) / 100);
+                    $item['subTotal']['discount'] += $item['subTotal']['discount'] * (intval($discount) / 100);
                 }
             }
-        } elseif (is_string($item[ 'discount' ]) && strpos($item[ 'discount' ], '%') !== false) {
-            $item[ 'subTotal' ][ 'discount' ] = $item[ 'subTotal' ][ 'price' ] * (intval($item[ 'discount' ]) / 100);
+        } elseif (is_string($item['discount']) && strpos($item['discount'], '%') !== false) {
+            $item['subTotal']['discount'] = $item['subTotal']['price'] * (intval($item['discount']) / 100);
         }
 
-        $item[ 'subTotal' ][ 'weight' ] = $item[ 'weight' ] * $item[ 'quantity' ];
+        $item['subTotal']['weight'] = $item['weight'] * $item['quantity'];
 
-        $this->storage[ $sku ] = $item;
+        $this->storage[$sku] = $item;
     }
 
     // ------------------------------------------------------------------------
@@ -97,10 +97,10 @@ 
             $item = array_merge($this->offsetGet($sku), $item);
 
             // update sub-total
-            $item[ 'subTotal' ][ 'price' ] = $item[ 'price' ] * $item[ 'quantity' ];
-            $item[ 'subTotal' ][ 'weight' ] = $item[ 'weight' ] * $item[ 'quantity' ];
+            $item['subTotal']['price'] = $item['price'] * $item['quantity'];
+            $item['subTotal']['weight'] = $item['weight'] * $item['quantity'];
 
-            $this->storage[ $sku ] = $item;
+            $this->storage[$sku] = $item;
 
             return true;
         }
@@ -121,8 +121,8 @@ 
 
         if ($this->count()) {
             foreach ($this->storage as $id => $item) {
-                if (isset($item[ 'subTotal' ][ 'weight' ])) {
-                    $totalWeight += (int)$item[ 'weight' ];
+                if (isset($item['subTotal']['weight'])) {
+                    $totalWeight += (int)$item['weight'];
                 }
             }
         }
@@ -143,8 +143,8 @@ 
 
         if ($this->count()) {
             foreach ($this->storage as $id => $item) {
-                if (isset($item[ 'subTotal' ][ 'price' ])) {
-                    $totalPrice += (int)$item[ 'price' ];
+                if (isset($item['subTotal']['price'])) {
+                    $totalPrice += (int)$item['price'];
                 }
             }
         }
@@ -159,7 +159,7 @@ 
      */
     public function destroy()
     {
-        unset($_SESSION[ 'o2system' ][ 'cart' ]);
+        unset($_SESSION['o2system']['cart']);
         parent::destroy();
     }
 }
\ No newline at end of file

src/Services/AccessControl.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/Models/Options.php

Indentation +23 added lines, -23 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,13 +245,13 @@ 
         $statuses = [];
 
         foreach ([
-                     'PUBLISH',
-                     'UNPUBLISH',
-                     'DRAFT',
-                     'ARCHIVED',
-                     'DELETED',
-                     'LOCKED'
-                 ] as $status
+                        'PUBLISH',
+                        'UNPUBLISH',
+                        'DRAFT',
+                        'ARCHIVED',
+                        'DELETED',
+                        'LOCKED'
+                    ] as $status
         ) {
             $statuses[ $status ] = $this->language->getLine($status);
         }
@@ -270,12 +270,12 @@ 
         $visibilities = [];
 
         foreach ([
-                     'PUBLIC',
-                     'PROTECTED',
-                     'PRIVATE',
-                     'READONLY',
-                     'MEMBERONLY',
-                 ] as $visibility
+                        'PUBLIC',
+                        'PROTECTED',
+                        'PRIVATE',
+                        'READONLY',
+                        'MEMBERONLY',
+                    ] 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;
@@ -253,7 +253,7 @@ 
                      'LOCKED'
                  ] as $status
         ) {
-            $statuses[ $status ] = $this->language->getLine($status);
+            $statuses[$status] = $this->language->getLine($status);
         }
 
         return $statuses;
@@ -277,7 +277,7 @@ 
                      'MEMBERONLY',
                  ] as $visibility
         ) {
-            $visibilities[ $visibility ] = $this->language->getLine($visibility);
+            $visibilities[$visibility] = $this->language->getLine($visibility);
         }
 
         return $visibilities;
@@ -295,7 +295,7 @@ 
         $languages = [];
 
         foreach ($this->language->getRegistry() as $language) {
-            $languages[ $language->getParameter() ] = $language->getProperties()->name;
+            $languages[$language->getParameter()] = $language->getProperties()->name;
         }
 
         return $languages;