o2system / reactor

src/Helpers/Text.php

Spacing +40 added lines, -40 removed lines

@@ -10,7 +10,7 @@ 
  */
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('text_split')) {
+if (!function_exists('text_split')) {
     /**
      * text_split
      *
@@ -27,14 +27,14 @@ 
     function text_split($text, $splitter = '<---text-split--->', $limit = 100)
     {
         $wrap_text = wordwrap($text, $limit, $splitter);
-        $wrap_text = preg_split('[' . $splitter . ']', $wrap_text, -1, PREG_SPLIT_NO_EMPTY);
+        $wrap_text = preg_split('['.$splitter.']', $wrap_text, -1, PREG_SPLIT_NO_EMPTY);
 
         return implode('', $wrap_text);
     }
 }
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('text_columns')) {
+if (!function_exists('text_columns')) {
     /**
      * text_columns
      *
@@ -51,8 +51,8 @@ 
         $return = explode("\n", wordwrap(strrev($text), $col_length));
 
         if (count($return) > $cols) {
-            $return[ $cols - 1 ] .= " " . $return[ $cols ];
-            unset($return[ $cols ]);
+            $return[$cols - 1] .= " ".$return[$cols];
+            unset($return[$cols]);
         }
 
         $return = array_map("strrev", $return);
@@ -62,7 +62,7 @@ 
 }
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('text_wrap')) {
+if (!function_exists('text_wrap')) {
     /**
      * text_wrap
      *
@@ -77,7 +77,7 @@ 
     function text_wrap($text, $chars = 10, $lines = false)
     {
         # the simple case - return wrapped words
-        if ( ! $lines) {
+        if (!$lines) {
             return wordwrap($text, $chars, "\n");
         }
         # truncate to maximum possible number of characters
@@ -86,12 +86,12 @@ 
         $return = wordwrap($return, $chars, "\n");
         preg_match("/(.+\n?){0,$lines}/", $return, $regs);
 
-        return $regs[ 0 ];
+        return $regs[0];
     }
 }
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('text_trim')) {
+if (!function_exists('text_trim')) {
     /**
      * Cuts the given string to a certain length without breaking a word.
      *
@@ -111,7 +111,7 @@ 
         // is $break present between $limit and the end of the string?
         if (false !== ($breakpoint = strpos($text, $break, $limit))) {
             if ($breakpoint < strlen($text) - 1) {
-                $text = substr($text, 0, $breakpoint) . $ending;
+                $text = substr($text, 0, $breakpoint).$ending;
             }
         }
 
@@ -121,7 +121,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('text_word_limiter')) {
+if (!function_exists('text_word_limiter')) {
     /**
      * text_word_limiter
      *
@@ -139,19 +139,19 @@ 
             return $str;
         }
 
-        preg_match('/^\s*+(?:\S++\s*+){1,' . (int)$limit . '}/', $str, $matches);
+        preg_match('/^\s*+(?:\S++\s*+){1,'.(int) $limit.'}/', $str, $matches);
 
-        if (strlen($str) === strlen($matches[ 0 ])) {
+        if (strlen($str) === strlen($matches[0])) {
             $end_char = '';
         }
 
-        return rtrim($matches[ 0 ]) . $end_char;
+        return rtrim($matches[0]).$end_char;
     }
 }
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('text_character_limiter')) {
+if (!function_exists('text_character_limiter')) {
     /**
      * text_character_limiter
      *
@@ -179,12 +179,12 @@ 
 
         $out = '';
         foreach (explode(' ', trim($string)) as $val) {
-            $out .= $val . ' ';
+            $out .= $val.' ';
 
             if (mb_strlen($out) >= $n) {
                 $out = trim($out);
 
-                return (mb_strlen($out) === mb_strlen($string)) ? $out : $out . $end_char;
+                return (mb_strlen($out) === mb_strlen($string)) ? $out : $out.$end_char;
             }
         }
     }
@@ -192,7 +192,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('text_censored')) {
+if (!function_exists('text_censored')) {
     /**
      * text_censored
      *
@@ -208,11 +208,11 @@ 
      */
     function text_censored($string, $censored, $replacement = '')
     {
-        if ( ! is_array($censored)) {
+        if (!is_array($censored)) {
             return $string;
         }
 
-        $string = ' ' . $string . ' ';
+        $string = ' '.$string.' ';
 
         // \w, \b and a few others do not match on a unicode character
         // set for performance reasons. As a result words like �ber
@@ -223,13 +223,13 @@ 
         foreach ($censored as $badword) {
             if ($replacement !== '') {
                 $string = preg_replace(
-                    "/({$delim})(" . str_replace('\*', '\w*?', preg_quote($badword, '/')) . ")({$delim})/i",
+                    "/({$delim})(".str_replace('\*', '\w*?', preg_quote($badword, '/')).")({$delim})/i",
                     "\\1{$replacement}\\3",
                     $string
                 );
             } else {
                 $string = preg_replace(
-                    "/({$delim})(" . str_replace('\*', '\w*?', preg_quote($badword, '/')) . ")({$delim})/ie",
+                    "/({$delim})(".str_replace('\*', '\w*?', preg_quote($badword, '/')).")({$delim})/ie",
                     "'\\1'.str_repeat('#', strlen('\\2')).'\\3'",
                     $string
                 );
@@ -242,7 +242,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('text_highlight_phrase')) {
+if (!function_exists('text_highlight_phrase')) {
     /**
      * text_highlight_phrase
      *
@@ -259,8 +259,8 @@ 
     {
         return ($string !== '' && $phrase !== '')
             ? preg_replace(
-                '/(' . preg_quote($phrase, '/') . ')/i' . ('UTF8_ENABLED' ? 'u' : ''),
-                $tag_open . '\\1' . $tag_close,
+                '/('.preg_quote($phrase, '/').')/i'.('UTF8_ENABLED' ? 'u' : ''),
+                $tag_open.'\\1'.$tag_close,
                 $string
             )
             : $string;
@@ -269,7 +269,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('text_word_wrap')) {
+if (!function_exists('text_word_wrap')) {
     /**
      * text_word_wrap
      *
@@ -299,9 +299,9 @@ 
         // strip the entire chunk and replace it with a marker.
         $unwrap = [];
         if (preg_match_all('|\{unwrap\}(.+?)\{/unwrap\}|s', $string, $matches)) {
-            for ($i = 0, $c = count($matches[ 0 ]); $i < $c; $i++) {
-                $unwrap[] = $matches[ 1 ][ $i ];
-                $string = str_replace($matches[ 0 ][ $i ], '{{unwrapped' . $i . '}}', $string);
+            for ($i = 0, $c = count($matches[0]); $i < $c; $i++) {
+                $unwrap[] = $matches[1][$i];
+                $string = str_replace($matches[0][$i], '{{unwrapped'.$i.'}}', $string);
             }
         }
 
@@ -316,7 +316,7 @@ 
             // Is the line within the allowed character count?
             // If so we'll join it to the output and continue
             if (mb_strlen($line) <= $limit) {
-                $output .= $line . "\n";
+                $output .= $line."\n";
                 continue;
             }
 
@@ -335,16 +335,16 @@ 
             // If $temp contains data it means we had to split up an over-length
             // word into smaller chunks so we'll add it back to our current line
             if ($temp !== '') {
-                $output .= $temp . "\n" . $line . "\n";
+                $output .= $temp."\n".$line."\n";
             } else {
-                $output .= $line . "\n";
+                $output .= $line."\n";
             }
         }
 
         // Put our markers back
         if (count($unwrap) > 0) {
             foreach ($unwrap as $key => $val) {
-                $output = str_replace('{{unwrapped' . $key . '}}', $val, $output);
+                $output = str_replace('{{unwrapped'.$key.'}}', $val, $output);
             }
         }
 
@@ -354,7 +354,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('text_ellipsis')) {
+if (!function_exists('text_ellipsis')) {
     /**
      * text_ellipsis
      *
@@ -386,13 +386,13 @@ 
             $end = mb_substr($string, -($max_length - mb_strlen($beg)));
         }
 
-        return $beg . $ellipsis . $end;
+        return $beg.$ellipsis.$end;
     }
 }
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('text_excerpt')) {
+if (!function_exists('text_excerpt')) {
     /**
      * text_excerpt
      *
@@ -413,7 +413,7 @@ 
         if (isset($phrase)) {
             $phrase_pos = strpos(strtolower($string), strtolower($phrase));
             $phrase_len = strlen($phrase);
-        } elseif ( ! isset($phrase)) {
+        } elseif (!isset($phrase)) {
             $phrase_pos = $radius / 2;
             $phrase_len = 1;
         }
@@ -424,19 +424,19 @@ 
         $count = 0;
         foreach (array_reverse($pre) as $pr => $e) {
             if ((strlen($e) + $count + 1) < $radius) {
-                $prev = ' ' . $e . $prev;
+                $prev = ' '.$e.$prev;
             }
             $count = ++$count + strlen($e);
         }
         $count = 0;
         foreach ($pos as $po => $s) {
             if ((strlen($s) + $count + 1) < $radius) {
-                $post .= $s . ' ';
+                $post .= $s.' ';
             }
             $count = ++$count + strlen($s);
         }
         $ellPre = $phrase ? $ellipsis : '';
 
-        return $ellPre . $prev . $phrase . $post . $ellipsis;
+        return $ellPre.$prev.$phrase.$post.$ellipsis;
     }
 }
\ No newline at end of file

src/Helpers/Array.php

Spacing +33 added lines, -33 removed lines

@@ -15,7 +15,7 @@ 
  * A collection of helper function to work with array.
  */
 // ------------------------------------------------------------------------
-if ( ! function_exists('array_get_value')) {
+if (!function_exists('array_get_value')) {
     /**
      * array_get_value
      *
@@ -30,13 +30,13 @@ 
      */
     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;
     }
 }
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('array_get_values')) {
+if (!function_exists('array_get_values')) {
     /**
      * array_get_values
      *
@@ -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 ];
-            } elseif ( ! empty($default)) {
-                $return[ $item ] = $default;
+                $return[$item] = $default[$item];
+            } elseif (!empty($default)) {
+                $return[$item] = $default;
             }
         }
 
@@ -72,7 +72,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('array_combines')) {
+if (!function_exists('array_combines')) {
     /**
      * array_combines
      *
@@ -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;
             }
         );
@@ -104,7 +104,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('array_group')) {
+if (!function_exists('array_group')) {
     /**
      * array_group
      *
@@ -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;
                 }
             );
         }
@@ -142,7 +142,7 @@ 
     }
 }
 
-if ( ! function_exists('array_filter_recursive')) {
+if (!function_exists('array_filter_recursive')) {
     /**
      * array_filter_recursive
      *
@@ -171,16 +171,16 @@ 
             if ($count > 0 and $count == $limit) {
                 return $result;
             }
-            if ( ! is_array($value)) {
+            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);
                     }
                 }
@@ -193,7 +193,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('array_search_recursive')) {
+if (!function_exists('array_search_recursive')) {
     /**
      * array_search_recursive
      *
@@ -212,7 +212,7 @@ 
             if ($strict === false) {
                 $needle = strtolower($needle);
 
-                if ( ! is_array($value)) {
+                if (!is_array($value)) {
                     $value = strtolower($value);
                 } else {
                     $value = array_map('strtolower', $value);
@@ -236,7 +236,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('array_unique_recursive')) {
+if (!function_exists('array_unique_recursive')) {
     /**
      * array_unique_recursive
      *
@@ -257,7 +257,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('array_flatten')) {
+if (!function_exists('array_flatten')) {
     /**
      * array_flatten
      *
@@ -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;
             }
         }
 
@@ -285,7 +285,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('range_price')) {
+if (!function_exists('range_price')) {
     /**
      * range_price
      *
@@ -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];
             }
         }
 
@@ -328,7 +328,7 @@ 
 // ------------------------------------------------------------------------
 
 
-if ( ! function_exists('range_date')) {
+if (!function_exists('range_date')) {
     /**
      * range_date
      *
@@ -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;
@@ -353,7 +353,7 @@ 
 }
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('range_year')) {
+if (!function_exists('range_year')) {
     /**
      * range_year
      *
@@ -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 +43 added lines, -43 removed lines

@@ -10,7 +10,7 @@ 
  */
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('str_echo')) {
+if (!function_exists('str_echo')) {
     /**
      * str_echo
      *
@@ -25,7 +25,7 @@ 
      */
     function str_echo($string, $prefix = null, $suffix = null, $glue = '')
     {
-        if ( ! empty($string) OR $string !== '') {
+        if (!empty($string) OR $string !== '') {
             return implode($glue, array_filter([
                 $prefix,
                 $string,
@@ -39,7 +39,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('str_email')) {
+if (!function_exists('str_email')) {
     /**
      * str_email
      *
@@ -51,7 +51,7 @@ 
      */
     function str_email($string)
     {
-        if ( ! empty($string) or $string != '') {
+        if (!empty($string) or $string != '') {
             return str_replace(
                 [
                     '.',
@@ -71,7 +71,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('str_alphanumeric')) {
+if (!function_exists('str_alphanumeric')) {
     /**
      * str_alphanumeric
      *
@@ -84,7 +84,7 @@ 
      */
     function str_alphanumeric($string)
     {
-        if ( ! empty($string) or $string != '') {
+        if (!empty($string) or $string != '') {
             $string = preg_replace("/[^a-zA-Z0-9\s]/", "", $string);
         }
 
@@ -94,7 +94,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('str_numeric')) {
+if (!function_exists('str_numeric')) {
     /**
      * str_numeric
      *
@@ -109,7 +109,7 @@ 
      */
     function str_numeric($string)
     {
-        if ( ! empty($string) or $string != '') {
+        if (!empty($string) or $string != '') {
             $string = preg_replace("/[^0-9\s]/", "", $string);
         }
 
@@ -119,7 +119,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('str_truncate')) {
+if (!function_exists('str_truncate')) {
     /**
      * str_truncate
      *
@@ -137,7 +137,7 @@ 
             $string = strip_tags($string);
             $string = substr($string, 0, $limit);
             $string = substr($string, 0, -(strlen(strrchr($string, ' '))));
-            $string = $string . $ending;
+            $string = $string.$ending;
         }
 
         return $string;
@@ -146,7 +146,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('str_shorten')) {
+if (!function_exists('str_shorten')) {
     /**
      * str_shorten
      *
@@ -163,7 +163,7 @@ 
         if (strlen($string) > $limit) {
             $prefix = substr($string, 0, ($limit / 2));
             $suffix = substr($string, -($limit / 2));
-            $string = $prefix . ' ... ' . $suffix;
+            $string = $prefix.' ... '.$suffix;
         }
 
         return $string;
@@ -172,7 +172,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('str_obfuscate')) {
+if (!function_exists('str_obfuscate')) {
     /**
      * str_obfuscate
      *
@@ -187,7 +187,7 @@ 
         $length = strlen($string);
         $scrambled = '';
         for ($i = 0; $i < $length; ++$i) {
-            $scrambled .= '&#' . ord(substr($string, $i, 1)) . ';';
+            $scrambled .= '&#'.ord(substr($string, $i, 1)).';';
         }
 
         return $scrambled;
@@ -196,7 +196,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('str_symbol_to_entities')) {
+if (!function_exists('str_symbol_to_entities')) {
 
     /**
      * str_symbol_to_entities
@@ -464,7 +464,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('str_strip_slashes')) {
+if (!function_exists('str_strip_slashes')) {
     /**
      * str_strip_slashes
      *
@@ -476,12 +476,12 @@ 
      */
     function str_strip_slashes($string)
     {
-        if ( ! is_array($string)) {
+        if (!is_array($string)) {
             return stripslashes($string);
         }
 
         foreach ($string as $key => $val) {
-            $string[ $key ] = str_strip_slashes($val);
+            $string[$key] = str_strip_slashes($val);
         }
 
         return $string;
@@ -490,7 +490,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('str_quote_strip')) {
+if (!function_exists('str_quote_strip')) {
     /**
      * str_quote_strip
      *
@@ -508,7 +508,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('str_quote_to_entities')) {
+if (!function_exists('str_quote_to_entities')) {
     /**
      * str_quote_to_entities
      *
@@ -527,7 +527,7 @@ 
 // ------------------------------------------------------------------------
 
 
-if ( ! function_exists('str_filter_char')) {
+if (!function_exists('str_filter_char')) {
     /**
      * str_filter_char
      *
@@ -547,7 +547,7 @@ 
      */
     function str_filter_char($str, $character = ',', $trim = false)
     {
-        $str = preg_replace('#' . preg_quote($character, '#') . '{2,}#', $character, $str);
+        $str = preg_replace('#'.preg_quote($character, '#').'{2,}#', $character, $str);
 
         return ($trim === true) ? trim($str, $character) : $str;
     }
@@ -555,7 +555,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('str_rand')) {
+if (!function_exists('str_rand')) {
     /**
      * str_rand
      *
@@ -604,7 +604,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('str_inc')) {
+if (!function_exists('str_inc')) {
     /**
      * str_inc
      *
@@ -618,15 +618,15 @@ 
      */
     function str_inc($string, $separator = '_', $first = 1)
     {
-        preg_match('/(.+)' . $separator . '([0-9]+)$/', $string, $match);
+        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;
     }
 }
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('str_alt')) {
+if (!function_exists('str_alt')) {
     /**
      * str_alt
      *
@@ -648,11 +648,11 @@ 
 
         $args = func_get_args();
 
-        return $args[ ($i++ % count($args)) ];
+        return $args[($i++ % count($args))];
     }
 }
 
-if ( ! function_exists('str_char_to_ascii')) {
+if (!function_exists('str_char_to_ascii')) {
     /**
      * str_char_to_ascii
      *
@@ -666,7 +666,7 @@ 
     {
         static $array_from, $array_to;
 
-        if ( ! is_array($array_from)) {
+        if (!is_array($array_from)) {
             $foreign_characters = [
                 '/ä|æ|ǽ/'                                                     => 'ae',
                 '/ö|œ/'                                                       => 'oe',
@@ -770,7 +770,7 @@ 
 // ------------------------------------------------------------------------
 
 
-if ( ! function_exists('str_entities_to_ascii')) {
+if (!function_exists('str_entities_to_ascii')) {
     /**
      * str_entities_to_ascii
      *
@@ -784,22 +784,22 @@ 
     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) {
                     $out .= chr($digits);
 
                 } elseif ($digits < 2048) {
-                    $out .= chr(192 + (($digits - ($digits % 64)) / 64)) . chr(128 + ($digits % 64));
+                    $out .= chr(192 + (($digits - ($digits % 64)) / 64)).chr(128 + ($digits % 64));
                 } else {
                     $out .= chr(224 + (($digits - ($digits % 4096)) / 4096))
                         . chr(128 + ((($digits % 4096) - ($digits % 64)) / 64))
                         . chr(128 + ($digits % 64));
                 }
 
-                $string = str_replace($matches[ 0 ][ $i ], $out, $string);
+                $string = str_replace($matches[0][$i], $out, $string);
             }
         }
 
@@ -818,7 +818,7 @@ 
 // ------------------------------------------------------------------------
 
 
-if ( ! function_exists('str_ascii_to_entities')) {
+if (!function_exists('str_ascii_to_entities')) {
     /**
      * str_ascii_to_entities
      *
@@ -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) {
                 /*
@@ -840,11 +840,11 @@ 
                     fair that we output that entity and restart $temp before continuing. -Paul
                 */
                 if (count($temp) === 1) {
-                    $out .= '&#' . array_shift($temp) . ';';
+                    $out .= '&#'.array_shift($temp).';';
                     $count = 1;
                 }
 
-                $out .= $string[ $i ];
+                $out .= $string[$i];
             } else {
                 if (count($temp) === 0) {
                     $count = ($ordinal < 224) ? 2 : 3;
@@ -854,15 +854,15 @@ 
 
                 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 . ';';
+                    $out .= '&#'.$number.';';
                     $count = 1;
                     $temp = [];
                 } // If this is the last iteration, just output whatever we have
                 elseif ($i === $s) {
-                    $out .= '&#' . implode(';', $temp) . ';';
+                    $out .= '&#'.implode(';', $temp).';';
                 }
             }
         }

src/Helpers/Html.php

Spacing +28 added lines, -28 removed lines

@@ -16,7 +16,7 @@ 
  */
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('tag')) {
+if (!function_exists('tag')) {
     /**
      * tag
      *
@@ -56,7 +56,7 @@ 
                 $element->textContent->push($contents);
             }
 
-            if ( ! is_null($contents)) {
+            if (!is_null($contents)) {
                 return $element->render();
             } else {
                 return $element->open();
@@ -67,7 +67,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('video')) {
+if (!function_exists('video')) {
     /**
      * video
      *
@@ -102,7 +102,7 @@ 
             }
 
             $source->attributes->addAttribute('src', $src);
-            $source->attributes->addAttribute('type', 'video/' . $ext);
+            $source->attributes->addAttribute('type', 'video/'.$ext);
             $video->childNodes->push($source);
         }
 
@@ -114,7 +114,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('audio')) {
+if (!function_exists('audio')) {
     /**
      * audio
      *
@@ -147,7 +147,7 @@ 
             }
 
             $source->attributes->addAttribute('src', $src);
-            $source->attributes->addAttribute('type', 'audio/' . $ext);
+            $source->attributes->addAttribute('type', 'audio/'.$ext);
             $audio->childNodes->push($source);
         }
 
@@ -159,7 +159,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('canvas')) {
+if (!function_exists('canvas')) {
     /**
      * canvas
      *
@@ -186,7 +186,7 @@ 
 }
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('heading')) {
+if (!function_exists('heading')) {
     /**
      * heading
      *
@@ -206,7 +206,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('ul')) {
+if (!function_exists('ul')) {
     /**
      * ul
      *
@@ -225,7 +225,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('ol')) {
+if (!function_exists('ol')) {
     /**
      * ol
      *
@@ -244,7 +244,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('img')) {
+if (!function_exists('img')) {
     /**
      * img
      *
@@ -267,7 +267,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('meta')) {
+if (!function_exists('meta')) {
     /**
      * meta
      *
@@ -283,9 +283,9 @@ 
     {
         // Since we allow the data to be passes as a string, a simple array
         // or a multidimensional one, we need to do a little prepping.
-        if ( ! is_array($meta)) {
+        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) {
@@ -316,7 +316,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('parse_attributes')) {
+if (!function_exists('parse_attributes')) {
     /**
      * parse_attributes
      *
@@ -334,11 +334,11 @@ 
             if (is_html($string)) {
                 $xml = simplexml_load_string(str_replace('>', '/>', $string));
             } else {
-                $xml = simplexml_load_string('<tag ' . $string . '/>');
+                $xml = simplexml_load_string('<tag '.$string.'/>');
             }
 
             foreach ($xml->attributes() as $key => $node) {
-                $attributes[ $key ] = (string)$node;
+                $attributes[$key] = (string) $node;
             }
         }
 
@@ -348,7 +348,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('remove_tags')) {
+if (!function_exists('remove_tags')) {
     /**
      * Remove Tag
      *
@@ -364,7 +364,7 @@ 
     function remove_tags($html, $tags, $strip_content = false)
     {
         $content = '';
-        if ( ! is_array($tags)) {
+        if (!is_array($tags)) {
             $tags = (strpos($html, '>') !== false ? explode('>', str_replace('<', '', $tags)) : [$tags]);
             if (end($tags) == '') {
                 array_pop($tags);
@@ -372,10 +372,10 @@ 
         }
         foreach ($tags as $tag) {
             if ($strip_content) {
-                $content = '(.+</' . $tag . '[^>]*>|)';
+                $content = '(.+</'.$tag.'[^>]*>|)';
             }
 
-            $html = preg_replace('#</?' . $tag . '[^>]*>' . $content . '#is', '', $html);
+            $html = preg_replace('#</?'.$tag.'[^>]*>'.$content.'#is', '', $html);
         }
 
         return $html;
@@ -384,7 +384,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('extract_tag')) {
+if (!function_exists('extract_tag')) {
     /**
      * Extract Tag
      *
@@ -397,11 +397,11 @@ 
      */
     function extract_tag($html, $tag = 'div')
     {
-        $html = preg_match_all("/(\<" . $tag . ")(.*?)(" . $tag . ">)/si", $html, $matches);
+        $html = preg_match_all("/(\<".$tag.")(.*?)(".$tag.">)/si", $html, $matches);
 
         $result = '';
-        foreach ($matches[ 0 ] as $item) {
-            $result = preg_replace("/\<[\/]?" . $tag . "\>/", '', $item);
+        foreach ($matches[0] as $item) {
+            $result = preg_replace("/\<[\/]?".$tag."\>/", '', $item);
         }
 
         return $result;

src/Models/NoSql/Model.php

Spacing +12 added lines, -12 removed lines

@@ -140,23 +140,23 @@ 
         $filename = pathinfo($filePath, PATHINFO_FILENAME);
 
         // Get model class directory name
-        $dirName = dirname($filePath) . DIRECTORY_SEPARATOR;
+        $dirName = dirname($filePath).DIRECTORY_SEPARATOR;
 
         if ($filename === 'Model') {
-            $subModelsDirName = dirname($dirName) . DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR;
+            $subModelsDirName = dirname($dirName).DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR;
 
             if (is_dir($subModelsDirName)) {
                 $subModelPath = $subModelsDirName;
             }
-        } elseif (is_dir($subModelsDirName = $dirName . $filename . DIRECTORY_SEPARATOR)) {
+        } elseif (is_dir($subModelsDirName = $dirName.$filename.DIRECTORY_SEPARATOR)) {
             $subModelPath = $subModelsDirName;
         }
 
         if (isset($subModelPath)) {
             loader()->addNamespace($reflection->name, $subModelPath);
 
-            foreach (glob($subModelPath . '*.php') as $filepath) {
-                $this->validSubModels[ strtolower(pathinfo($filepath, PATHINFO_FILENAME)) ] = $filepath;
+            foreach (glob($subModelPath.'*.php') as $filepath) {
+                $this->validSubModels[strtolower(pathinfo($filepath, PATHINFO_FILENAME))] = $filepath;
             }
         }
     }
@@ -183,25 +183,25 @@ 
 
     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 ])) {
-            $className = '\\' . get_called_class() . '\\' . ucfirst($model);
+        if (is_file($this->validSubModels[$model])) {
+            $className = '\\'.get_called_class().'\\'.ucfirst($model);
             $className = str_replace('\Base\\Model', '\Models', $className);
 
             if (class_exists($className)) {

src/Models/Sql/Model.php

Spacing +10 added lines, -10 removed lines

@@ -143,27 +143,27 @@ 
         $filename = pathinfo($filePath, PATHINFO_FILENAME);
 
         // Get model class directory name
-        $dirName = dirname($filePath) . DIRECTORY_SEPARATOR;
+        $dirName = dirname($filePath).DIRECTORY_SEPARATOR;
 
         // Get sub models or siblings models
         if ($filename === 'Model' || $filename === modules()->current()->getDirName()) {
-            $subModelsDirName = dirname($dirName) . DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR;
+            $subModelsDirName = dirname($dirName).DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR;
 
             if (is_dir($subModelsDirName)) {
                 $subModelPath = $subModelsDirName;
             }
-        } elseif (is_dir($subModelsDirName = $dirName . $filename . DIRECTORY_SEPARATOR)) {
+        } elseif (is_dir($subModelsDirName = $dirName.$filename.DIRECTORY_SEPARATOR)) {
             $subModelPath = $subModelsDirName;
         }
 
         if (isset($subModelPath)) {
             loader()->addNamespace($reflection->name, $subModelPath);
 
-            foreach (glob($subModelPath . '*.php') as $filepath) {
+            foreach (glob($subModelPath.'*.php') as $filepath) {
                 if ($filepath === $filePath) {
                     continue;
                 }
-                $this->validSubModels[ camelcase(pathinfo($filepath, PATHINFO_FILENAME)) ] = $filepath;
+                $this->validSubModels[camelcase(pathinfo($filepath, PATHINFO_FILENAME))] = $filepath;
             }
         }
     }
@@ -174,7 +174,7 @@ 
     {
         $modelClassName = get_called_class();
 
-        if ( ! models()->has($modelClassName)) {
+        if (!models()->has($modelClassName)) {
             models()->load($modelClassName, $modelClassName);
         }
 
@@ -210,7 +210,7 @@ 
             }
         }
 
-        if (empty($get[ $property ])) {
+        if (empty($get[$property])) {
             if (services()->has($property)) {
                 return services()->get($property);
             } elseif ($this->hasSubModel($property)) {
@@ -229,8 +229,8 @@ 
     {
         if ($this->hasSubModel($model)) {
             $classNames = [
-                '\\' . get_called_class() . '\\' . ucfirst($model),
-                '\\' . get_namespace(get_called_class()) . ucfirst($model),
+                '\\'.get_called_class().'\\'.ucfirst($model),
+                '\\'.get_namespace(get_called_class()).ucfirst($model),
             ];
 
             foreach ($classNames as $className) {
@@ -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/Controller.php

Spacing +6 added lines, -6 removed lines

@@ -24,7 +24,7 @@ 
 {
     public function &__get($property)
     {
-        $get[ $property ] = false;
+        $get[$property] = false;
 
         // CodeIgniter property aliasing
         if ($property === 'load') {
@@ -32,15 +32,15 @@ 
         }
 
         if (services()->has($property)) {
-            $get[ $property ] = services()->get($property);
+            $get[$property] = services()->get($property);
         } elseif (o2system()->__isset($property)) {
-            $get[ $property ] = o2system()->__get($property);
+            $get[$property] = o2system()->__get($property);
         } elseif ($property === 'model') {
-            $get[ $property ] = models('controller');
+            $get[$property] = models('controller');
         } elseif ($property === 'services' || $property === 'libraries') {
-            $get[ $property ] = services();
+            $get[$property] = services();
         }
 
-        return $get[ $property ];
+        return $get[$property];
     }
 }
\ No newline at end of file

src/Services/Loader.php

Spacing +25 added lines, -25 removed lines

@@ -114,7 +114,7 @@ 
     public function addNamespace($namespace, $baseDirectory, $prepend = false)
     {
         // normalize namespace prefix
-        $namespace = trim($namespace, '\\') . '\\';
+        $namespace = trim($namespace, '\\').'\\';
 
         if (empty($namespace) OR $namespace === '\\') {
             return;
@@ -122,24 +122,24 @@ 
 
         // normalize the base directory with a trailing separator
         $baseDirectory = str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $baseDirectory);
-        $baseDirectory = rtrim($baseDirectory, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $baseDirectory = rtrim($baseDirectory, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 
         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);
@@ -148,8 +148,8 @@ 
             output()->addFilePath($baseDirectory);
 
             // Autoload Composer
-            if (is_file($baseDirectory . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php')) {
-                require($baseDirectory . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php');
+            if (is_file($baseDirectory.'vendor'.DIRECTORY_SEPARATOR.'autoload.php')) {
+                require($baseDirectory.'vendor'.DIRECTORY_SEPARATOR.'autoload.php');
             }
         }
     }
@@ -170,10 +170,10 @@ 
         $dir = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $dir);
 
         $dir = realpath($dir);
-        $dir = rtrim($dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $dir = rtrim($dir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 
         if (array_key_exists($dir, $this->namespaceDirsMap)) {
-            return $this->namespaceDirsMap[ $dir ];
+            return $this->namespaceDirsMap[$dir];
         }
 
         return false;
@@ -211,10 +211,10 @@ 
      */
     public function getNamespaceDirs($namespace)
     {
-        $namespace = trim($namespace, '\\') . '\\';
+        $namespace = trim($namespace, '\\').'\\';
 
         if (array_key_exists($namespace, $this->namespaceDirs)) {
-            return $this->namespaceDirs[ $namespace ];
+            return $this->namespaceDirs[$namespace];
         }
 
         return false;
@@ -237,29 +237,29 @@ 
         }
 
         if ($this->requireFile($helper)) {
-            $this->loadedHelpers[ pathinfo($helper, PATHINFO_FILENAME) ][] = $helper;
+            $this->loadedHelpers[pathinfo($helper, PATHINFO_FILENAME)][] = $helper;
 
             return;
         }
 
         $helperDirectories = [
-            PATH_KERNEL . 'Helpers' . DIRECTORY_SEPARATOR,
-            PATH_FRAMEWORK . 'Helpers' . DIRECTORY_SEPARATOR,
-            PATH_APP . 'Helpers' . DIRECTORY_SEPARATOR,
+            PATH_KERNEL.'Helpers'.DIRECTORY_SEPARATOR,
+            PATH_FRAMEWORK.'Helpers'.DIRECTORY_SEPARATOR,
+            PATH_APP.'Helpers'.DIRECTORY_SEPARATOR,
         ];
         
-        if ( ! array_key_exists($helper, $this->loadedHelpers)) {
-            $this->loadedHelpers[ $helper ] = [];
+        if (!array_key_exists($helper, $this->loadedHelpers)) {
+            $this->loadedHelpers[$helper] = [];
         }
 
         foreach ($helperDirectories as $helperDirectory) {
 
-            $helperFilePath = $helperDirectory . studlycase($helper) . '.php';
+            $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;
             }
         }
     }
@@ -335,12 +335,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

src/Http/Middleware.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
      */
     public function run()
     {
-        if ( ! empty($this->registry)) {
+        if (!empty($this->registry)) {
 
             $request = server_request();