o2system / framework

src/Cli/Commanders/Make/Helper.php

Spacing +3 added lines, -3 removed lines

@@ -72,13 +72,13 @@
             exit(EXIT_ERROR);
         }
 
-        $vars[ 'CREATE_DATETIME' ] = date('d/m/Y H:m');
-        $vars[ 'HELPER' ] = underscore(
+        $vars['CREATE_DATETIME'] = date('d/m/Y H:m');
+        $vars['HELPER'] = underscore(
             snakecase(
                 pathinfo($filePath, PATHINFO_FILENAME)
             )
         );
-        $vars[ 'FILEPATH' ] = $filePath;
+        $vars['FILEPATH'] = $filePath;
 
         $phpTemplate = <<<PHPTEMPLATE
 <?php

src/Cli/Commanders/Make/Widget.php

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
             exit(EXIT_ERROR);
         }
 
-        $jsProps[ 'name' ] = readable(
+        $jsProps['name'] = readable(
             pathinfo($widgetPath, PATHINFO_FILENAME),
             true
         );
@@ -81,10 +81,10 @@ 
                 ) . '\\';
         } else {
             $namespace = prepare_class_name($this->namespace);
-            $jsProps[ 'namespace' ] = rtrim($namespace, '\\') . '\\';
+            $jsProps['namespace'] = rtrim($namespace, '\\') . '\\';
         }
 
-        $jsProps[ 'created' ] = date('d M Y');
+        $jsProps['created'] = date('d M Y');
 
         loader()->addNamespace($namespace, $widgetPath);
 

src/Cli/Commanders/Make/Config.php

Spacing +3 added lines, -3 removed lines

@@ -72,9 +72,9 @@
             exit(EXIT_ERROR);
         }
 
-        $vars[ 'CREATE_DATETIME' ] = date('d/m/Y H:m');
-        $vars[ 'CONFIG' ] = '$' . camelcase(pathinfo($filePath, PATHINFO_FILENAME));
-        $vars[ 'FILEPATH' ] = $filePath;
+        $vars['CREATE_DATETIME'] = date('d/m/Y H:m');
+        $vars['CONFIG'] = '$' . camelcase(pathinfo($filePath, PATHINFO_FILENAME));
+        $vars['FILEPATH'] = $filePath;
 
         $phpTemplate = <<<PHPTEMPLATE
 <?php

src/Cli/Commanders/Maintenance.php

Spacing +14 added lines, -14 removed lines

@@ -151,16 +151,16 @@ 
         $options = input()->get();
 
         if (empty($options)) {
-            $_GET[ 'switch' ] = 'ON';
-            $_GET[ 'mode' ] = 'default';
-            $_GET[ 'lifetime' ] = 300;
-            $_GET[ 'title' ] = language()->getLine(strtoupper('CLI_MAINTENANCE_TITLE'));
-            $_GET[ 'message' ] = language()->getLine(strtoupper('CLI_MAINTENANCE_MESSAGE'));
+            $_GET['switch'] = 'ON';
+            $_GET['mode'] = 'default';
+            $_GET['lifetime'] = 300;
+            $_GET['title'] = language()->getLine(strtoupper('CLI_MAINTENANCE_TITLE'));
+            $_GET['message'] = language()->getLine(strtoupper('CLI_MAINTENANCE_MESSAGE'));
         } else {
-            $_GET[ 'mode' ] = 'default';
-            $_GET[ 'lifetime' ] = 300;
-            $_GET[ 'title' ] = language()->getLine(strtoupper('CLI_MAINTENANCE_TITLE'));
-            $_GET[ 'message' ] = language()->getLine(strtoupper('CLI_MAINTENANCE_MESSAGE'));
+            $_GET['mode'] = 'default';
+            $_GET['lifetime'] = 300;
+            $_GET['title'] = language()->getLine(strtoupper('CLI_MAINTENANCE_TITLE'));
+            $_GET['message'] = language()->getLine(strtoupper('CLI_MAINTENANCE_MESSAGE'));
         }
 
         parent::execute();
@@ -173,11 +173,11 @@ 
                     (new Format())
                         ->setContextualClass(Format::DANGER)
                         ->setString(language()->getLine('CLI_MAINTENANCE_ALREADY_STARTED', [
-                            $maintenanceInfo[ 'mode' ],
-                            $maintenanceInfo[ 'datetime' ],
-                            date('r', strtotime($maintenanceInfo[ 'datetime' ]) + $maintenanceInfo[ 'lifetime' ]),
-                            $maintenanceInfo[ 'title' ],
-                            $maintenanceInfo[ 'message' ],
+                            $maintenanceInfo['mode'],
+                            $maintenanceInfo['datetime'],
+                            date('r', strtotime($maintenanceInfo['datetime']) + $maintenanceInfo['lifetime']),
+                            $maintenanceInfo['title'],
+                            $maintenanceInfo['message'],
                         ]))
                         ->setNewLinesAfter(1)
                 );

src/Cli/Commander.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 {
     public function &__get($property)
     {
-        $get[ $property ] = false;
+        $get[$property] = false;
 
         // CodeIgniter property aliasing
         if ($property === 'load') {
@@ -38,6 +38,6 @@ 
             return models('controller');
         }
 
-        return $get[ $property ];
+        return $get[$property];
     }
 }
\ No newline at end of file

src/Helpers/Html.php

Spacing +6 added lines, -6 removed lines

@@ -285,7 +285,7 @@ 
         // or a multidimensional one, we need to do a little prepping.
         if ( ! is_array($meta)) {
             $meta = [['name' => $meta, 'content' => $content, 'type']];
-        } elseif (isset($meta[ 'name' ])) {
+        } elseif (isset($meta['name'])) {
             // Turn single array into multidimensional
             $meta = [$meta];
         }
@@ -295,11 +295,11 @@ 
         foreach ($meta as $attributes) {
             $element = new \O2System\Html\Element('meta');
             $element->attributes->addAttribute('type',
-                (isset($attributes[ 'type' ]) && $attributes[ 'type' ] !== 'name') ? 'http-equiv' : 'name');
+                (isset($attributes['type']) && $attributes['type'] !== 'name') ? 'http-equiv' : 'name');
             $element->attributes->addAttribute('name',
-                isset($attributes[ 'content' ]) ? $attributes[ 'content' ] : '');
+                isset($attributes['content']) ? $attributes['content'] : '');
             $element->attributes->addAttribute('name',
-                isset($attributes[ 'content' ]) ? $attributes[ 'content' ] : '');
+                isset($attributes['content']) ? $attributes['content'] : '');
 
             if (count($attributes)) {
                 foreach ($attributes as $meta => $value) {
@@ -338,7 +338,7 @@ 
             }
 
             foreach ($xml->attributes() as $key => $node) {
-                $attributes[ $key ] = (string)$node;
+                $attributes[$key] = (string)$node;
             }
         }
 
@@ -400,7 +400,7 @@ 
         $html = preg_match_all("/(\<" . $tag . ")(.*?)(" . $tag . ">)/si", $html, $matches);
 
         $result = '';
-        foreach ($matches[ 0 ] as $item) {
+        foreach ($matches[0] as $item) {
             $result = preg_replace("/\<[\/]?" . $tag . "\>/", '', $item);
         }
 

src/Helpers/Array.php

Spacing +19 added lines, -19 removed lines

@@ -30,7 +30,7 @@ 
      */
     function array_get_value($key, array $array, $default = null)
     {
-        return array_key_exists($key, $array) ? $array[ $key ] : $default;
+        return array_key_exists($key, $array) ? $array[$key] : $default;
     }
 }
 
@@ -57,11 +57,11 @@ 
 
         foreach ($keys as $item) {
             if (array_key_exists($item, $array)) {
-                $return[ $item ] = $array[ $item ];
+                $return[$item] = $array[$item];
             } elseif (is_array($default) && array_key_exists($item, $default)) {
-                $return[ $item ] = $default[ $item ];
+                $return[$item] = $default[$item];
             } elseif ( ! empty($default)) {
-                $return[ $item ] = $default;
+                $return[$item] = $default;
             }
         }
 
@@ -88,12 +88,12 @@ 
         $combine_array = [];
 
         foreach ($keys as $index => $key) {
-            $combine_array[ $key ][] = $values[ $index ];
+            $combine_array[$key][] = $values[$index];
         }
 
         array_walk(
             $combine_array,
-            function (&$value) {
+            function(&$value) {
                 $value = (count($value) == 1) ? array_pop($value) : $value;
             }
         );
@@ -122,18 +122,18 @@ 
         if ($flip) {
             array_walk_recursive(
                 $array,
-                function ($value, $key) use (&$group_array) {
-                    if ( ! isset($group_array[ $value ]) || ! is_array($group_array[ $value ])) {
-                        $group_array[ $value ] = [];
+                function($value, $key) use (&$group_array) {
+                    if ( ! isset($group_array[$value]) || ! is_array($group_array[$value])) {
+                        $group_array[$value] = [];
                     }
-                    $group_array[ $value ][] = $key;
+                    $group_array[$value][] = $key;
                 }
             );
         } else {
             array_walk_recursive(
                 $array,
-                function ($value, $key) use (&$group_array) {
-                    $group_array[ $key ][] = $value;
+                function($value, $key) use (&$group_array) {
+                    $group_array[$key][] = $value;
                 }
             );
         }
@@ -173,14 +173,14 @@ 
             }
             if ( ! is_array($value)) {
                 if ($key != $value) {
-                    $result[ $key ] = $value;
+                    $result[$key] = $value;
                     $count++;
                 }
             } else {
                 $sub = array_filter_recursive($value, $value, $limit);
                 if (count($sub) > 0) {
                     if ($key != $value) {
-                        $result[ $key ] = $sub;
+                        $result[$key] = $sub;
                         $count += count($sub);
                     }
                 }
@@ -275,7 +275,7 @@ 
             if (is_array($value)) {
                 $flat_array = array_merge($flat_array, array_flatten($value));
             } else {
-                $flat_array[ $key ] = $value;
+                $flat_array[$key] = $value;
             }
         }
 
@@ -314,10 +314,10 @@ 
 
         $prices = [];
         for ($i = 0; $i < count($ranges); $i++) {
-            if ($ranges[ $i ] == $max) {
+            if ($ranges[$i] == $max) {
                 break;
             } else {
-                $prices[ $ranges[ $i ] ] = ($ranges[ $i + 1 ] == 0) ? $ranges[ $i ] * 2 : $ranges[ $i + 1 ];
+                $prices[$ranges[$i]] = ($ranges[$i + 1] == 0) ? $ranges[$i] * 2 : $ranges[$i + 1];
             }
         }
 
@@ -345,7 +345,7 @@ 
 
         $date_range = [];
         for ($i = 0; $i < $days; $i++) {
-            $date_range[ $i ] = $start_date + ($i * 24 * 60 * 60);
+            $date_range[$i] = $start_date + ($i * 24 * 60 * 60);
         }
 
         return $date_range;
@@ -372,7 +372,7 @@ 
         $years = [];
 
         foreach (range($min, $max, $step) as $year) {
-            $years[ $year ] = $year;
+            $years[$year] = $year;
         }
 
         return $years;

src/Helpers/String.php

Spacing +10 added lines, -10 removed lines

@@ -481,7 +481,7 @@ 
         }
 
         foreach ($string as $key => $val) {
-            $string[ $key ] = str_strip_slashes($val);
+            $string[$key] = str_strip_slashes($val);
         }
 
         return $string;
@@ -620,7 +620,7 @@ 
     {
         preg_match('/(.+)' . $separator . '([0-9]+)$/', $string, $match);
 
-        return isset($match[ 2 ]) ? $match[ 1 ] . $separator . ($match[ 2 ] + 1) : $string . $separator . $first;
+        return isset($match[2]) ? $match[1] . $separator . ($match[2] + 1) : $string . $separator . $first;
     }
 }
 
@@ -648,7 +648,7 @@ 
 
         $args = func_get_args();
 
-        return $args[ ($i++ % count($args)) ];
+        return $args[($i++ % count($args))];
     }
 }
 
@@ -784,8 +784,8 @@ 
     function str_entities_to_ascii($string, $all = true)
     {
         if (preg_match_all('/\&#(\d+)\;/', $string, $matches)) {
-            for ($i = 0, $s = count($matches[ 0 ]); $i < $s; $i++) {
-                $digits = $matches[ 1 ][ $i ];
+            for ($i = 0, $s = count($matches[0]); $i < $s; $i++) {
+                $digits = $matches[1][$i];
                 $out = '';
 
                 if ($digits < 128) {
@@ -799,7 +799,7 @@ 
                         . chr(128 + ($digits % 64));
                 }
 
-                $string = str_replace($matches[ 0 ][ $i ], $out, $string);
+                $string = str_replace($matches[0][$i], $out, $string);
             }
         }
 
@@ -832,7 +832,7 @@ 
     {
         $out = '';
         for ($i = 0, $s = strlen($string) - 1, $count = 1, $temp = []; $i <= $s; $i++) {
-            $ordinal = ord($string[ $i ]);
+            $ordinal = ord($string[$i]);
 
             if ($ordinal < 128) {
                 /*
@@ -844,7 +844,7 @@ 
                     $count = 1;
                 }
 
-                $out .= $string[ $i ];
+                $out .= $string[$i];
             } else {
                 if (count($temp) === 0) {
                     $count = ($ordinal < 224) ? 2 : 3;
@@ -854,8 +854,8 @@ 
 
                 if (count($temp) === $count) {
                     $number = ($count === 3)
-                        ? (($temp[ 0 ] % 16) * 4096) + (($temp[ 1 ] % 64) * 64) + ($temp[ 2 ] % 64)
-                        : (($temp[ 0 ] % 32) * 64) + ($temp[ 1 ] % 64);
+                        ? (($temp[0] % 16) * 4096) + (($temp[1] % 64) * 64) + ($temp[2] % 64)
+                        : (($temp[0] % 32) * 64) + ($temp[1] % 64);
 
                     $out .= '&#' . $number . ';';
                     $count = 1;

src/Helpers/Datetime.php

Spacing +29 added lines, -29 removed lines

@@ -295,7 +295,7 @@ 
             if ($diff->$key) {
                 $value = $diff->$key . ' ' . $value . ($diff->$key > 1 && language()->getDefaultLocale() === 'en' ? 's' : '');
             } else {
-                unset($string[ $key ]);
+                unset($string[$key]);
             }
         }
 
@@ -328,8 +328,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
@@ -385,9 +385,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;
                 }
             }
         }
@@ -474,7 +474,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') {
@@ -498,7 +498,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'])) {
@@ -523,7 +523,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'));
@@ -538,7 +538,7 @@ 
         ];
 
         if (array_key_exists($return, $available)) {
-            return $interval->{$available[ $return ]};
+            return $interval->{$available[$return]};
         } elseif (isset($interval->{$return})) {
             return $interval->{$return};
         }
@@ -623,8 +623,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;
                 }
             }
         }
@@ -675,7 +675,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;
@@ -701,8 +701,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;
@@ -743,8 +743,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;
@@ -869,12 +869,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);
     }
@@ -1164,7 +1164,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];
     }
 }
 
@@ -1324,9 +1324,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;
             }
         }
@@ -1370,12 +1370,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,
@@ -1455,7 +1455,7 @@ 
             return $zones;
         }
 
-        return isset($zones[ $tz ]) ? $zones[ $tz ] : 0;
+        return isset($zones[$tz]) ? $zones[$tz] : 0;
     }
 }
 
@@ -1539,7 +1539,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);
             }
 

Braces +3 added lines, -1 removed lines

@@ -1557,10 +1557,12 @@
         }
         $range[] = $from->format($format);
 
-        if (is_int($arg)) // Day intervals
+        if (is_int($arg)) {
+            // Day intervals
         {
             do {
                 $from->modify('+1 day');
+        }
                 $range[] = $from->format($format);
             } while (--$arg > 0);
         } else // end date UNIX timestamp