o2system / framework

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 {

src/Helpers/Datetime.php

Spacing +29 added lines, -29 removed lines

@@ -285,7 +285,7 @@ 
             if ($diff->$key) {
                 $value = $diff->$key . ' ' . $value . ($diff->$key > 1 && language()->getDefaultLocale() === 'en' ? 's' : '');
             } else {
-                unset($string[ $key ]);
+                unset($string[$key]);
             }
         }
 
@@ -319,8 +319,8 @@ 
     function dates_between($start_date, $end_date, $format = 'Y-m-d')
     {
         $day = 60 * 60 * 24;
-        $start_date = (! is_numeric($start_date) ? strtotime($start_date) : $start_date);
-        $end_date = (! is_numeric($end_date) ? strtotime($end_date) : $end_date);
+        $start_date = ( ! is_numeric($start_date) ? strtotime($start_date) : $start_date);
+        $end_date = ( ! is_numeric($end_date) ? strtotime($end_date) : $end_date);
 
         $days_diff = round(
             ($end_date - $start_date) / $day
@@ -376,9 +376,9 @@ 
                 $time_12 = date("h:i a", strtotime($hours));
                 $time_24 = $hours;
                 if ($mode == 12) {
-                    $time[ $time_12 ] = $time_12;
+                    $time[$time_12] = $time_12;
                 } elseif ($mode == 24) {
-                    $time[ $time_24 ] = $time_24;
+                    $time[$time_24] = $time_24;
                 }
             }
         }
@@ -465,7 +465,7 @@ 
      */
     function is_weekend($date)
     {
-        $date = (! is_numeric($date) ? strtotime(str_replace('/', '-', $date)) : $date);
+        $date = ( ! is_numeric($date) ? strtotime(str_replace('/', '-', $date)) : $date);
         $date = date('D', $date);
 
         if ($date == 'Sat' OR $date == 'Sun') {
@@ -489,7 +489,7 @@ 
      */
     function is_weekday($date)
     {
-        $date = (! is_numeric($date) ? strtotime(str_replace('/', '-', $date)) : $date);
+        $date = ( ! is_numeric($date) ? strtotime(str_replace('/', '-', $date)) : $date);
         $date = date('D', $date);
 
         if ( ! in_array($date, ['Sat', 'Sun'])) {
@@ -515,7 +515,7 @@ 
      */
     function get_age($birthday, $return = 'years')
     {
-        $birthday = (! is_numeric($birthday) ? strtotime(str_replace('/', '-', $birthday)) : $birthday);
+        $birthday = ( ! is_numeric($birthday) ? strtotime(str_replace('/', '-', $birthday)) : $birthday);
 
         $birthday = new DateTime(date('Y-m-d', $birthday));
         $now = new DateTime(date('Y-m-d'));
@@ -530,7 +530,7 @@ 
         ];
 
         if (array_key_exists($return, $available)) {
-            return $interval->{$available[ $return ]};
+            return $interval->{$available[$return]};
         } elseif (isset($interval->{$return})) {
             return $interval->{$return};
         }
@@ -616,8 +616,8 @@ 
             }
             foreach ($periods as $period => $seconds_in_period) {
                 if ($seconds >= $seconds_in_period) {
-                    $durations[ $period ] = floor($seconds / $seconds_in_period);
-                    $seconds -= $durations[ $period ] * $seconds_in_period;
+                    $durations[$period] = floor($seconds / $seconds_in_period);
+                    $seconds -= $durations[$period] * $seconds_in_period;
                 }
             }
         }
@@ -672,7 +672,7 @@ 
      */
     function add_time_duration($start_time, $duration, $return = 'time')
     {
-        $start_time = (! is_numeric($start_time) ? strtotime($start_time) : $start_time);
+        $start_time = ( ! is_numeric($start_time) ? strtotime($start_time) : $start_time);
         $duration = $duration * 60 * 60; // (x) hours * 60 minutes * 60 seconds
 
         $add_time = $start_time + $duration;
@@ -700,8 +700,8 @@ 
      */
     function calculate_hours($start_time, $end_time, $return = 'time')
     {
-        $start_time = (! is_numeric($start_time) ? strtotime($start_time) : $start_time);
-        $end_time = (! is_numeric($end_time) ? strtotime($end_time) : $end_time);
+        $start_time = ( ! is_numeric($start_time) ? strtotime($start_time) : $start_time);
+        $end_time = ( ! is_numeric($end_time) ? strtotime($end_time) : $end_time);
 
         // Times Difference
         $difference = $end_time - $start_time;
@@ -744,8 +744,8 @@ 
      */
     function time_difference($start_time, $end_time, $return = 'array')
     {
-        $start_time = (! is_numeric($start_time) ? strtotime($start_time) : $start_time);
-        $end_time = (! is_numeric($end_time) ? strtotime($end_time) : $end_time);
+        $start_time = ( ! is_numeric($start_time) ? strtotime($start_time) : $start_time);
+        $end_time = ( ! is_numeric($end_time) ? strtotime($end_time) : $end_time);
 
         // Times Difference
         $difference = $end_time - $start_time;
@@ -879,12 +879,12 @@ 
             $seconds -= $minutes * 60;
         }
 
-        $format[ 'days' ] = $days;
-        $format[ 'years' ] = $years;
-        $format[ 'months' ] = $months;
-        $format[ 'hours' ] = $hours;
-        $format[ 'minutes' ] = $minutes;
-        $format[ 'seconds' ] = $seconds;
+        $format['days'] = $days;
+        $format['years'] = $years;
+        $format['months'] = $months;
+        $format['hours'] = $hours;
+        $format['minutes'] = $minutes;
+        $format['seconds'] = $seconds;
 
         return new \O2System\Spl\DataStructures\SplArrayObject($format);
     }
@@ -1143,7 +1143,7 @@ 
 
         $days_in_month = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 
-        return $days_in_month[ $month - 1 ];
+        return $days_in_month[$month - 1];
     }
 }
 
@@ -1317,9 +1317,9 @@ 
         if (isset($ampm)) {
             $ampm = strtolower($ampm);
 
-            if ($ampm[ 0 ] === 'p' && $hour < 12) {
+            if ($ampm[0] === 'p' && $hour < 12) {
                 $hour += 12;
-            } elseif ($ampm[ 0 ] === 'a' && $hour === 12) {
+            } elseif ($ampm[0] === 'a' && $hour === 12) {
                 $hour = 0;
             }
         }
@@ -1365,12 +1365,12 @@ 
 
         // Date Like: YYYYMMDD
         if (preg_match('/^(\d{2})\d{2}(\d{4})$/i', $bad_date, $matches)) {
-            return date($format, strtotime($matches[ 1 ] . '/01/' . $matches[ 2 ]));
+            return date($format, strtotime($matches[1] . '/01/' . $matches[2]));
         }
 
         // Date Like: MM-DD-YYYY __or__ M-D-YYYY (or anything in between)
         if (preg_match('/^(\d{1,2})-(\d{1,2})-(\d{4})$/i', $bad_date, $matches)) {
-            return date($format, strtotime($matches[ 3 ] . '-' . $matches[ 1 ] . '-' . $matches[ 2 ]));
+            return date($format, strtotime($matches[3] . '-' . $matches[1] . '-' . $matches[2]));
         }
 
         // Any other kind of string, when converted into UNIX time,
@@ -1450,7 +1450,7 @@ 
             return $zones;
         }
 
-        return isset($zones[ $timezone ]) ? $zones[ $timezone ] : 0;
+        return isset($zones[$timezone]) ? $zones[$timezone] : 0;
     }
 }
 
@@ -1537,7 +1537,7 @@ 
              * the end date might actually be less than 24 hours away from the previously
              * generated DateTime object, but either way - we have to append it manually.
              */
-            if ( ! is_int($arg) && $range[ count($range) - 1 ] !== $arg->format($format)) {
+            if ( ! is_int($arg) && $range[count($range) - 1] !== $arg->format($format)) {
                 $range[] = $arg->format($format);
             }