Passed
Push — master ( 1a0534...bd22ef )
by Sebastian
02:16
created
src/ConvertHelper.php 1 patch
Spacing   +116 added lines, -116 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
             $amount = substr_count($line, "\t") - $min;
60 60
             $line = trim($line);
61 61
             if ($amount >= 1) {
62
-                $line = str_repeat("\t", $amount) . $line;
62
+                $line = str_repeat("\t", $amount).$line;
63 63
             }
64 64
 
65 65
             $converted[] = $line;
@@ -131,10 +131,10 @@  discard block
 block discarded – undo
131 131
 
132 132
         // specifically handle zero
133 133
         if ($seconds <= 0) {
134
-            return '0 ' . t('seconds');
134
+            return '0 '.t('seconds');
135 135
         }
136 136
         
137
-        if($seconds < 1) {
137
+        if ($seconds < 1) {
138 138
             return t('less than a second');
139 139
         }
140 140
 
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
         foreach ($units as $def) {
143 143
             $quot = intval($seconds / $def['value']);
144 144
             if ($quot) {
145
-                $item = $quot . ' ';
145
+                $item = $quot.' ';
146 146
                 if (abs($quot) > 1) {
147 147
                     $item .= $def['plural'];
148 148
                 } else {
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
             return $last;
160 160
         }
161 161
 
162
-        return implode(', ', $tokens) . ' ' . t('and') . ' ' . $last;
162
+        return implode(', ', $tokens).' '.t('and').' '.$last;
163 163
     }
164 164
 
165 165
     /**
@@ -176,11 +176,11 @@  discard block
 block discarded – undo
176 176
      */
177 177
     public static function duration2string($datefrom, $dateto = -1)
178 178
     {
179
-        if($datefrom instanceof \DateTime) {
179
+        if ($datefrom instanceof \DateTime) {
180 180
             $datefrom = ConvertHelper::date2timestamp($datefrom);
181 181
         }
182 182
         
183
-        if($dateto instanceof \DateTime) {
183
+        if ($dateto instanceof \DateTime) {
184 184
             $dateto = ConvertHelper::date2timestamp($dateto);
185 185
         }
186 186
         
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
         $interval = "";
202 202
         
203 203
         $future = false;
204
-        if($difference < 0) {
204
+        if ($difference < 0) {
205 205
             $difference = $difference * -1;
206 206
             $future = true;
207 207
         }
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
                 $day = (int)date("j", $dateto);
277 277
                 $year = (int)date("Y", $datefrom);
278 278
                 
279
-                while(mktime($hour, $min, $sec, $month + ($months_difference), $day, $year) < $dateto) 
279
+                while (mktime($hour, $min, $sec, $month + ($months_difference), $day, $year) < $dateto) 
280 280
                 {
281 281
                     $months_difference++;
282 282
                 }
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
                     $datediff--;
292 292
                 }
293 293
 
294
-                if($future) {
294
+                if ($future) {
295 295
                     $result = ($datediff == 1) ? t('In one month', $datediff) : t('In %1s months', $datediff);
296 296
                 } else {
297 297
                     $result = ($datediff == 1) ? t('One month ago', $datediff) : t('%1s months ago', $datediff);
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
 
301 301
             case "y":
302 302
                 $datediff = floor($difference / 60 / 60 / 24 / 365);
303
-                if($future) {
303
+                if ($future) {
304 304
                     $result = ($datediff == 1) ? t('In one year', $datediff) : t('In %1s years', $datediff);
305 305
                 } else {
306 306
                     $result = ($datediff == 1) ? t('One year ago', $datediff) : t('%1s years ago', $datediff);
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
 
310 310
             case "d":
311 311
                 $datediff = floor($difference / 60 / 60 / 24);
312
-                if($future) {
312
+                if ($future) {
313 313
                     $result = ($datediff == 1) ? t('In one day', $datediff) : t('In %1s days', $datediff);
314 314
                 } else {
315 315
                     $result = ($datediff == 1) ? t('One day ago', $datediff) : t('%1s days ago', $datediff);
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
 
319 319
             case "ww":
320 320
                 $datediff = floor($difference / 60 / 60 / 24 / 7);
321
-                if($future) {
321
+                if ($future) {
322 322
                     $result = ($datediff == 1) ? t('In one week', $datediff) : t('In %1s weeks', $datediff);
323 323
                 } else {
324 324
                     $result = ($datediff == 1) ? t('One week ago', $datediff) : t('%1s weeks ago', $datediff);
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 
328 328
             case "h":
329 329
                 $datediff = floor($difference / 60 / 60);
330
-                if($future) {
330
+                if ($future) {
331 331
                     $result = ($datediff == 1) ? t('In one hour', $datediff) : t('In %1s hours', $datediff);
332 332
                 } else {
333 333
                     $result = ($datediff == 1) ? t('One hour ago', $datediff) : t('%1s hours ago', $datediff);
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
 
337 337
             case "n":
338 338
                 $datediff = floor($difference / 60);
339
-                if($future) {
339
+                if ($future) {
340 340
                     $result = ($datediff == 1) ? t('In one minute', $datediff) : t('In %1s minutes', $datediff);
341 341
                 } else {
342 342
                     $result = ($datediff == 1) ? t('One minute ago', $datediff) : t('%1s minutes ago', $datediff);
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
 
346 346
             case "s":
347 347
                 $datediff = $difference;
348
-                if($future) {
348
+                if ($future) {
349 349
                     $result = ($datediff == 1) ? t('In one second', $datediff) : t('In %1s seconds', $datediff);
350 350
                 } else {
351 351
                     $result = ($datediff == 1) ? t('One second ago', $datediff) : t('%1s seconds ago', $datediff);
@@ -368,9 +368,9 @@  discard block
 block discarded – undo
368 368
         return $geshi->parse_code();
369 369
     }
370 370
     
371
-    public static function highlight_xml($xml, $formatSource=false)
371
+    public static function highlight_xml($xml, $formatSource = false)
372 372
     {
373
-        if($formatSource) 
373
+        if ($formatSource) 
374 374
         {
375 375
             $dom = new \DOMDocument();
376 376
             $dom->loadXML($xml);
@@ -408,22 +408,22 @@  discard block
 block discarded – undo
408 408
         $terabyte = $gigabyte * 1024;
409 409
 
410 410
         if (($bytes >= 0) && ($bytes < $kilobyte)) {
411
-            return $bytes . ' ' . t('B');
411
+            return $bytes.' '.t('B');
412 412
 
413 413
         } elseif (($bytes >= $kilobyte) && ($bytes < $megabyte)) {
414
-            return round($bytes / $kilobyte, $precision) . ' ' . t('Kb');
414
+            return round($bytes / $kilobyte, $precision).' '.t('Kb');
415 415
 
416 416
         } elseif (($bytes >= $megabyte) && ($bytes < $gigabyte)) {
417
-            return round($bytes / $megabyte, $precision) . ' ' . t('Mb');
417
+            return round($bytes / $megabyte, $precision).' '.t('Mb');
418 418
 
419 419
         } elseif (($bytes >= $gigabyte) && ($bytes < $terabyte)) {
420
-            return round($bytes / $gigabyte, $precision) . ' ' . t('Gb');
420
+            return round($bytes / $gigabyte, $precision).' '.t('Gb');
421 421
 
422 422
         } elseif ($bytes >= $terabyte) {
423
-            return round($bytes / $gigabyte, $precision) . ' ' . t('Tb');
423
+            return round($bytes / $gigabyte, $precision).' '.t('Tb');
424 424
         }
425 425
 
426
-        return $bytes . ' ' . t('B');
426
+        return $bytes.' '.t('B');
427 427
     }
428 428
 
429 429
    /**
@@ -443,34 +443,34 @@  discard block
 block discarded – undo
443 443
             return $text;
444 444
         }
445 445
 
446
-        $text = trim(mb_substr($text, 0, $targetLength)) . $append;
446
+        $text = trim(mb_substr($text, 0, $targetLength)).$append;
447 447
 
448 448
         return $text;
449 449
     }
450 450
 
451
-    public static function var_dump($var, $html=true)
451
+    public static function var_dump($var, $html = true)
452 452
     {
453 453
         $info = parseVariable($var);
454 454
         
455
-        if($html) {
455
+        if ($html) {
456 456
             return $info->toHTML();
457 457
         }
458 458
         
459 459
         return $info->toString();
460 460
     }
461 461
     
462
-    public static function print_r($var, $return=false, $html=true)
462
+    public static function print_r($var, $return = false, $html = true)
463 463
     {
464 464
         $result = self::var_dump($var, $html);
465 465
         
466
-        if($html) {
466
+        if ($html) {
467 467
             $result = 
468 468
             '<pre style="background:#fff;color:#333;padding:16px;border:solid 1px #bbb;border-radius:4px">'.
469 469
                 $result.
470 470
             '</pre>';
471 471
         }
472 472
         
473
-        if($return) {
473
+        if ($return) {
474 474
             return $result;
475 475
         }
476 476
         
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
 
491 491
     public static function string2bool($string)
492 492
     {
493
-        if($string === '' || $string === null) {
493
+        if ($string === '' || $string === null) {
494 494
             return false;
495 495
         }
496 496
         
@@ -545,10 +545,10 @@  discard block
 block discarded – undo
545 545
     public static function date2listLabel(\DateTime $date, $includeTime = false, $shortMonth = false)
546 546
     {
547 547
         $today = new \DateTime();
548
-        if($date->format('d.m.Y') == $today->format('d.m.Y')) {
548
+        if ($date->format('d.m.Y') == $today->format('d.m.Y')) {
549 549
             $label = t('Today');
550 550
         } else {
551
-            $label = $date->format('d') . '. ' . self::month2string((int)$date->format('m'), $shortMonth) . ' ';
551
+            $label = $date->format('d').'. '.self::month2string((int)$date->format('m'), $shortMonth).' ';
552 552
             if ($date->format('Y') != date('Y')) {
553 553
                 $label .= $date->format('Y');
554 554
             }
@@ -639,28 +639,28 @@  discard block
 block discarded – undo
639 639
         $hexAlphabet = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
640 640
         
641 641
         $stack = array();
642
-        foreach(self::$controlChars as $char)
642
+        foreach (self::$controlChars as $char)
643 643
         {
644 644
             $tokens = explode('-', $char);
645 645
             $start = $tokens[0];
646 646
             $end = $tokens[1];
647 647
             $prefix = substr($start, 0, 3);
648 648
             $range = array();
649
-            foreach($hexAlphabet as $number) {
649
+            foreach ($hexAlphabet as $number) {
650 650
                 $range[] = $prefix.$number;
651 651
             }
652 652
             
653 653
             $use = false;
654
-            foreach($range as $number) {
655
-                if($number == $start) {
654
+            foreach ($range as $number) {
655
+                if ($number == $start) {
656 656
                     $use = true;
657 657
                 }
658 658
                 
659
-                if($use) {
659
+                if ($use) {
660 660
                     $stack[] = $number;
661 661
                 }
662 662
                 
663
-                if($number == $end) {
663
+                if ($number == $end) {
664 664
                     break;
665 665
                 }
666 666
             }
@@ -681,7 +681,7 @@  discard block
 block discarded – undo
681 681
         $chars = self::getControlCharactersAsHex();
682 682
         
683 683
         $result = array();
684
-        foreach($chars as $char) {
684
+        foreach ($chars as $char) {
685 685
             $result[] = hex2bin($char);
686 686
         }
687 687
         
@@ -699,14 +699,14 @@  discard block
 block discarded – undo
699 699
         $chars = self::getControlCharactersAsHex();
700 700
         
701 701
         $result = array();
702
-        foreach($chars as $char) {
702
+        foreach ($chars as $char) {
703 703
             $result[] = '\u'.strtolower($char);
704 704
         }
705 705
         
706 706
         return $result;
707 707
     }
708 708
     
709
-    protected static $controlChars =  array(
709
+    protected static $controlChars = array(
710 710
         '0000-0008', // control chars
711 711
         '000E-000F', // control chars
712 712
         '0010-001F', // control chars
@@ -728,19 +728,19 @@  discard block
 block discarded – undo
728 728
      */
729 729
     public static function stripControlCharacters(string $string) : string
730 730
     {
731
-        if(empty($string)) {
731
+        if (empty($string)) {
732 732
             return $string;
733 733
         }
734 734
         
735 735
         // create the regex from the unicode characters list
736
-        if(!isset(self::$controlCharsRegex)) 
736
+        if (!isset(self::$controlCharsRegex)) 
737 737
         {
738 738
             $chars = self::getControlCharactersAsHex();
739 739
 
740 740
             // we use the notation \x{0000} to specify the unicode character key
741 741
             // in the regular expression.
742 742
             $stack = array();
743
-            foreach($chars as $char) {
743
+            foreach ($chars as $char) {
744 744
                 $stack[] = '\x{'.$char.'}';
745 745
             }
746 746
             
@@ -774,7 +774,7 @@  discard block
 block discarded – undo
774 774
             $ordInt = ord($octet);
775 775
             // Convert from int (base 10) to hex (base 16), for PHP \x syntax
776 776
             $ordHex = base_convert($ordInt, 10, 16);
777
-            $output .= '\x' . $ordHex;
777
+            $output .= '\x'.$ordHex;
778 778
         }
779 779
         return $output;
780 780
     }
@@ -806,19 +806,19 @@  discard block
 block discarded – undo
806 806
     
807 807
     protected static function convertScalarForComparison($scalar)
808 808
     {
809
-        if($scalar === '' || is_null($scalar)) {
809
+        if ($scalar === '' || is_null($scalar)) {
810 810
             return null;
811 811
         }
812 812
         
813
-        if(is_bool($scalar)) {
813
+        if (is_bool($scalar)) {
814 814
             return self::bool2string($scalar);
815 815
         }
816 816
         
817
-        if(is_array($scalar)) {
817
+        if (is_array($scalar)) {
818 818
             $scalar = md5(serialize($scalar));
819 819
         }
820 820
         
821
-        if($scalar !== null && !is_scalar($scalar)) {
821
+        if ($scalar !== null && !is_scalar($scalar)) {
822 822
             throw new ConvertHelper_Exception(
823 823
                 'Not a scalar value in comparison',
824 824
                 null,
@@ -867,7 +867,7 @@  discard block
 block discarded – undo
867 867
     public static function bool2string($boolean, bool $yesno = false) : string
868 868
     {
869 869
         // allow 'yes', 'true', 'no', 'false' string notations as well
870
-        if(!is_bool($boolean)) {
870
+        if (!is_bool($boolean)) {
871 871
             $boolean = self::string2bool($boolean);
872 872
         }
873 873
         
@@ -908,15 +908,15 @@  discard block
 block discarded – undo
908 908
     public static function array2attributeString($array)
909 909
     {
910 910
         $tokens = array();
911
-        foreach($array as $attr => $value) {
912
-            if($value == '' || $value == null) {
911
+        foreach ($array as $attr => $value) {
912
+            if ($value == '' || $value == null) {
913 913
                 continue;
914 914
             }
915 915
             
916 916
             $tokens[] = $attr.'="'.$value.'"';
917 917
         }
918 918
         
919
-        if(empty($tokens)) {
919
+        if (empty($tokens)) {
920 920
             return '';
921 921
         }
922 922
         
@@ -931,10 +931,10 @@  discard block
 block discarded – undo
931 931
     * @param string $string
932 932
     * @return string
933 933
     */
934
-    public static function string2attributeJS($string, $quoted=true)
934
+    public static function string2attributeJS($string, $quoted = true)
935 935
     {
936 936
         $converted = addslashes(htmlspecialchars(strip_tags($string), ENT_QUOTES, 'UTF-8'));
937
-        if($quoted) {
937
+        if ($quoted) {
938 938
             $converted = "'".$converted."'";
939 939
         } 
940 940
         
@@ -952,11 +952,11 @@  discard block
 block discarded – undo
952 952
     */
953 953
     public static function isBoolean($value) : bool
954 954
     {
955
-        if(is_bool($value)) {
955
+        if (is_bool($value)) {
956 956
             return true;
957 957
         }
958 958
         
959
-        if(!is_scalar($value)) {
959
+        if (!is_scalar($value)) {
960 960
             return false;
961 961
         }
962 962
         
@@ -972,7 +972,7 @@  discard block
 block discarded – undo
972 972
     public static function array2styleString(array $subject) : string
973 973
     {
974 974
         $tokens = array();
975
-        foreach($subject as $name => $value) {
975
+        foreach ($subject as $name => $value) {
976 976
             $tokens[] = $name.':'.$value;
977 977
         }
978 978
         
@@ -1030,7 +1030,7 @@  discard block
 block discarded – undo
1030 1030
     * 
1031 1031
     * @see JSHelper::buildRegexStatement()
1032 1032
     */
1033
-    public static function regex2js(string $regex, string $statementType=JSHelper::JS_REGEX_OBJECT)
1033
+    public static function regex2js(string $regex, string $statementType = JSHelper::JS_REGEX_OBJECT)
1034 1034
     {
1035 1035
         return JSHelper::buildRegexStatement($regex, $statementType);
1036 1036
     }
@@ -1047,11 +1047,11 @@  discard block
 block discarded – undo
1047 1047
     * @throws ConvertHelper_Exception
1048 1048
     * @return string
1049 1049
     */
1050
-    public static function var2json($variable, int $options=0, int $depth=512) : string
1050
+    public static function var2json($variable, int $options = 0, int $depth = 512) : string
1051 1051
     {
1052 1052
         $result = json_encode($variable, $options, $depth);
1053 1053
         
1054
-        if($result !== false) {
1054
+        if ($result !== false) {
1055 1055
             return $result;
1056 1056
         }
1057 1057
         
@@ -1076,10 +1076,10 @@  discard block
 block discarded – undo
1076 1076
     public static function stripUTFBom($string)
1077 1077
     {
1078 1078
         $boms = FileHelper::getUTFBOMs();
1079
-        foreach($boms as $bomChars) {
1079
+        foreach ($boms as $bomChars) {
1080 1080
             $length = mb_strlen($bomChars);
1081 1081
             $text = mb_substr($string, 0, $length);
1082
-            if($text==$bomChars) {
1082
+            if ($text == $bomChars) {
1083 1083
                 return mb_substr($string, $length);
1084 1084
             }
1085 1085
         }
@@ -1096,7 +1096,7 @@  discard block
 block discarded – undo
1096 1096
     */
1097 1097
     public static function string2utf8($string)
1098 1098
     {
1099
-        if(!self::isStringASCII($string)) {
1099
+        if (!self::isStringASCII($string)) {
1100 1100
             return \ForceUTF8\Encoding::toUTF8($string);
1101 1101
         }
1102 1102
         
@@ -1114,11 +1114,11 @@  discard block
 block discarded – undo
1114 1114
     */
1115 1115
     public static function isStringASCII($string)
1116 1116
     {
1117
-        if($string === '' || $string === NULL) {
1117
+        if ($string === '' || $string === NULL) {
1118 1118
             return true;
1119 1119
         }
1120 1120
         
1121
-        if(!is_string($string)) {
1121
+        if (!is_string($string)) {
1122 1122
             return false;
1123 1123
         }
1124 1124
         
@@ -1152,7 +1152,7 @@  discard block
 block discarded – undo
1152 1152
     * @param array $options
1153 1153
     * @return float
1154 1154
     */
1155
-    public static function matchString($source, $target, $options=array())
1155
+    public static function matchString($source, $target, $options = array())
1156 1156
     {
1157 1157
         $defaults = array(
1158 1158
             'maxLevenshtein' => 10,
@@ -1162,12 +1162,12 @@  discard block
 block discarded – undo
1162 1162
         $options = array_merge($defaults, $options);
1163 1163
         
1164 1164
         // avoid doing this via levenshtein
1165
-        if($source == $target) {
1165
+        if ($source == $target) {
1166 1166
             return 100;
1167 1167
         }
1168 1168
         
1169 1169
         $diff = levenshtein($source, $target);
1170
-        if($diff > $options['maxLevenshtein']) {
1170
+        if ($diff > $options['maxLevenshtein']) {
1171 1171
             return 0;
1172 1172
         }
1173 1173
         
@@ -1181,8 +1181,8 @@  discard block
 block discarded – undo
1181 1181
         
1182 1182
         $offset = 0;
1183 1183
         $keep = array();
1184
-        foreach($tokens as $token) {
1185
-            if($interval->$token > 0) {
1184
+        foreach ($tokens as $token) {
1185
+            if ($interval->$token > 0) {
1186 1186
                 $keep = array_slice($tokens, $offset);
1187 1187
                 break;
1188 1188
             }
@@ -1191,16 +1191,16 @@  discard block
 block discarded – undo
1191 1191
         }
1192 1192
         
1193 1193
         $parts = array();
1194
-        foreach($keep as $token) 
1194
+        foreach ($keep as $token) 
1195 1195
         {
1196 1196
             $value = $interval->$token;
1197 1197
             $label = '';
1198 1198
             
1199 1199
             $suffix = 'p';
1200
-            if($value == 1) { $suffix = 's'; }
1200
+            if ($value == 1) { $suffix = 's'; }
1201 1201
             $token .= $suffix;
1202 1202
             
1203
-            switch($token) {
1203
+            switch ($token) {
1204 1204
                 case 'ys': $label = t('1 year'); break;
1205 1205
                 case 'yp': $label = t('%1$s years', $value); break;
1206 1206
                 case 'ms': $label = t('1 month'); break;
@@ -1218,7 +1218,7 @@  discard block
 block discarded – undo
1218 1218
             $parts[] = $label;
1219 1219
         }
1220 1220
         
1221
-        if(count($parts) == 1) {
1221
+        if (count($parts) == 1) {
1222 1222
             return $parts[0];
1223 1223
         } 
1224 1224
         
@@ -1289,24 +1289,24 @@  discard block
 block discarded – undo
1289 1289
     * @see ConvertHelper::INTERVAL_HOURS
1290 1290
     * @see ConvertHelper::INTERVAL_DAYS
1291 1291
     */
1292
-    public static function interval2total(\DateInterval $interval, $unit=self::INTERVAL_SECONDS) : int
1292
+    public static function interval2total(\DateInterval $interval, $unit = self::INTERVAL_SECONDS) : int
1293 1293
     {
1294 1294
         $total = $interval->format('%a');
1295 1295
         if ($unit == self::INTERVAL_DAYS) {
1296 1296
             return (int)$total;
1297 1297
         }
1298 1298
         
1299
-        $total = ($total * 24) + ($interval->h );
1299
+        $total = ($total * 24) + ($interval->h);
1300 1300
         if ($unit == self::INTERVAL_HOURS) {
1301 1301
             return (int)$total;
1302 1302
         }
1303 1303
     
1304
-        $total = ($total * 60) + ($interval->i );
1304
+        $total = ($total * 60) + ($interval->i);
1305 1305
         if ($unit == self::INTERVAL_MINUTES) {
1306 1306
             return (int)$total;
1307 1307
         }
1308 1308
 
1309
-        $total = ($total * 60) + ($interval->s );
1309
+        $total = ($total * 60) + ($interval->s);
1310 1310
         if ($unit == self::INTERVAL_SECONDS) {
1311 1311
             return (int)$total;
1312 1312
         }
@@ -1335,13 +1335,13 @@  discard block
 block discarded – undo
1335 1335
     * @param string $short
1336 1336
     * @return string|NULL
1337 1337
     */
1338
-    public static function date2dayName(\DateTime $date, $short=false)
1338
+    public static function date2dayName(\DateTime $date, $short = false)
1339 1339
     {
1340 1340
         $day = $date->format('l');
1341 1341
         $invariant = self::getDayNamesInvariant();
1342 1342
         
1343 1343
         $idx = array_search($day, $invariant);
1344
-        if($idx !== false) {
1344
+        if ($idx !== false) {
1345 1345
             $localized = self::getDayNames($short);
1346 1346
             return $localized[$idx];
1347 1347
         }
@@ -1364,10 +1364,10 @@  discard block
 block discarded – undo
1364 1364
     * @param string $short
1365 1365
     * @return string[]
1366 1366
     */
1367
-    public static function getDayNames($short=false)
1367
+    public static function getDayNames($short = false)
1368 1368
     {
1369
-        if($short) {
1370
-            if(!isset(self::$daysShort)) {
1369
+        if ($short) {
1370
+            if (!isset(self::$daysShort)) {
1371 1371
                 self::$daysShort = array(
1372 1372
                     t('Mon'),
1373 1373
                     t('Tue'),
@@ -1382,7 +1382,7 @@  discard block
 block discarded – undo
1382 1382
             return self::$daysShort;
1383 1383
         }
1384 1384
         
1385
-        if(!isset(self::$days)) {
1385
+        if (!isset(self::$days)) {
1386 1386
             self::$days = array(
1387 1387
                 t('Monday'),
1388 1388
                 t('Tuesday'),
@@ -1407,17 +1407,17 @@  discard block
 block discarded – undo
1407 1407
      */
1408 1408
     public static function implodeWithAnd(array $list, $sep = ', ', $conjunction = null)
1409 1409
     {
1410
-        if(empty($list)) {
1410
+        if (empty($list)) {
1411 1411
             return '';
1412 1412
         }
1413 1413
         
1414
-        if(empty($conjunction)) {
1414
+        if (empty($conjunction)) {
1415 1415
             $conjunction = t('and');
1416 1416
         }
1417 1417
         
1418 1418
         $last = array_pop($list);
1419
-        if($list) {
1420
-            return implode($sep, $list) . $conjunction . ' ' . $last;
1419
+        if ($list) {
1420
+            return implode($sep, $list).$conjunction.' '.$last;
1421 1421
         }
1422 1422
         
1423 1423
         return $last;
@@ -1436,7 +1436,7 @@  discard block
 block discarded – undo
1436 1436
     public static function string2array(string $string) : array
1437 1437
     {
1438 1438
         $result = preg_split('//u', $string, null, PREG_SPLIT_NO_EMPTY);
1439
-        if($result !== false) {
1439
+        if ($result !== false) {
1440 1440
             return $result;
1441 1441
         }
1442 1442
         
@@ -1451,12 +1451,12 @@  discard block
 block discarded – undo
1451 1451
     */
1452 1452
     public static function isStringHTML(string $string) : bool
1453 1453
     {
1454
-        if(preg_match('%<[a-z/][\s\S]*>%siU', $string)) {
1454
+        if (preg_match('%<[a-z/][\s\S]*>%siU', $string)) {
1455 1455
             return true;
1456 1456
         }
1457 1457
         
1458 1458
         $decoded = html_entity_decode($string);
1459
-        if($decoded !== $string) {
1459
+        if ($decoded !== $string) {
1460 1460
             return true;
1461 1461
         }
1462 1462
         
@@ -1593,7 +1593,7 @@  discard block
 block discarded – undo
1593 1593
         // extract parameter names from the query string
1594 1594
         $result = array();
1595 1595
         preg_match_all('/&?([^&]+)=.*/sixU', $queryString, $result, PREG_PATTERN_ORDER);
1596
-        if(isset($result[1])) {
1596
+        if (isset($result[1])) {
1597 1597
             $paramNames = $result[1];
1598 1598
         }
1599 1599
         
@@ -1616,11 +1616,11 @@  discard block
 block discarded – undo
1616 1616
         // possible naming conflicts like having both parameters "foo.bar" 
1617 1617
         // and "foo_bar" in the query string: since "foo.bar" would be converted
1618 1618
         // to "foo_bar", one of the two would be replaced.
1619
-        if($fixRequired) 
1619
+        if ($fixRequired) 
1620 1620
         {
1621 1621
             $counter = 1;
1622 1622
             $placeholders = array();
1623
-            foreach($paramNames as $paramName)
1623
+            foreach ($paramNames as $paramName)
1624 1624
             {
1625 1625
                  // create a unique placeholder name
1626 1626
                  $placeholder = '__PLACEHOLDER'.$counter.'__';
@@ -1650,13 +1650,13 @@  discard block
 block discarded – undo
1650 1650
         parse_str($queryString, $parsed);
1651 1651
         
1652 1652
         // do any of the parameter names need to be fixed?
1653
-        if(!$fixRequired) {
1653
+        if (!$fixRequired) {
1654 1654
             return $parsed;
1655 1655
         }
1656 1656
         
1657 1657
         $keep = array();
1658 1658
         
1659
-        foreach($parsed as $name => $value)
1659
+        foreach ($parsed as $name => $value)
1660 1660
         {
1661 1661
              $keep[$table[$name]] = $value;
1662 1662
         }
@@ -1675,14 +1675,14 @@  discard block
 block discarded – undo
1675 1675
     * @param bool $caseInsensitive
1676 1676
     * @return ConvertHelper_StringMatch[]
1677 1677
     */
1678
-    public static function findString(string $needle, string $haystack, bool $caseInsensitive=false)
1678
+    public static function findString(string $needle, string $haystack, bool $caseInsensitive = false)
1679 1679
     {
1680
-        if($needle === '') {
1680
+        if ($needle === '') {
1681 1681
             return array();
1682 1682
         }
1683 1683
         
1684 1684
         $function = 'mb_strpos';
1685
-        if($caseInsensitive) {
1685
+        if ($caseInsensitive) {
1686 1686
             $function = 'mb_stripos';
1687 1687
         }
1688 1688
         
@@ -1690,7 +1690,7 @@  discard block
 block discarded – undo
1690 1690
         $positions = array();
1691 1691
         $length = mb_strlen($needle);
1692 1692
         
1693
-        while( ($pos = $function($haystack, $needle, $pos)) !== false) 
1693
+        while (($pos = $function($haystack, $needle, $pos)) !== false) 
1694 1694
         {
1695 1695
             $match = mb_substr($haystack, $pos, $length);
1696 1696
             $positions[] = new ConvertHelper_StringMatch($pos, $match);
@@ -1710,7 +1710,7 @@  discard block
 block discarded – undo
1710 1710
     */
1711 1711
     public static function explodeTrim(string $delimiter, string $string) : array
1712 1712
     {
1713
-        if(empty($string) || empty($delimiter)) {
1713
+        if (empty($string) || empty($delimiter)) {
1714 1714
             return array();
1715 1715
         }
1716 1716
         
@@ -1718,8 +1718,8 @@  discard block
 block discarded – undo
1718 1718
         $tokens = array_map('trim', $tokens);
1719 1719
         
1720 1720
         $keep = array();
1721
-        foreach($tokens as $token) {
1722
-            if($token !== '') {
1721
+        foreach ($tokens as $token) {
1722
+            if ($token !== '') {
1723 1723
                 $keep[] = $token;
1724 1724
             }
1725 1725
         }
@@ -1737,11 +1737,11 @@  discard block
 block discarded – undo
1737 1737
     */
1738 1738
     public static function detectEOLCharacter(string $subjectString) : ?ConvertHelper_EOL
1739 1739
     {
1740
-        if(empty($subjectString)) {
1740
+        if (empty($subjectString)) {
1741 1741
             return null;
1742 1742
         }
1743 1743
         
1744
-        if(!isset(self::$eolChars))
1744
+        if (!isset(self::$eolChars))
1745 1745
         {
1746 1746
             $cr = chr((int)hexdec('0d'));
1747 1747
             $lf = chr((int)hexdec('0a'));
@@ -1772,18 +1772,18 @@  discard block
 block discarded – undo
1772 1772
         
1773 1773
         $max = 0;
1774 1774
         $results = array();
1775
-        foreach(self::$eolChars as $def) 
1775
+        foreach (self::$eolChars as $def) 
1776 1776
         {
1777 1777
             $amount = substr_count($subjectString, $def['char']);
1778 1778
             
1779
-            if($amount > $max)
1779
+            if ($amount > $max)
1780 1780
             {
1781 1781
                 $max = $amount;
1782 1782
                 $results[] = $def;
1783 1783
             }
1784 1784
         }
1785 1785
         
1786
-        if(empty($results)) {
1786
+        if (empty($results)) {
1787 1787
             return null;
1788 1788
         }
1789 1789
         
@@ -1803,9 +1803,9 @@  discard block
 block discarded – undo
1803 1803
     */
1804 1804
     public static function arrayRemoveKeys(array &$array, array $keys) : void
1805 1805
     {
1806
-        foreach($keys as $key) 
1806
+        foreach ($keys as $key) 
1807 1807
         {
1808
-            if(array_key_exists($key, $array)) {
1808
+            if (array_key_exists($key, $array)) {
1809 1809
                 unset($array[$key]); 
1810 1810
             }
1811 1811
         }
@@ -1820,17 +1820,17 @@  discard block
 block discarded – undo
1820 1820
     */
1821 1821
     public static function isInteger($value) : bool
1822 1822
     {
1823
-        if(is_int($value)) {
1823
+        if (is_int($value)) {
1824 1824
             return true;
1825 1825
         }
1826 1826
         
1827 1827
         // booleans get converted to numbers, so they would
1828 1828
         // actually match the regex.
1829
-        if(is_bool($value)) {
1829
+        if (is_bool($value)) {
1830 1830
             return false;
1831 1831
         }
1832 1832
         
1833
-        if(is_string($value) && $value !== '') {
1833
+        if (is_string($value) && $value !== '') {
1834 1834
             return preg_match('/\A-?\d+\z/', $value) === 1;
1835 1835
         }
1836 1836
         
@@ -1857,7 +1857,7 @@  discard block
 block discarded – undo
1857 1857
         $d2->add(new \DateInterval('PT'.$seconds.'S'));
1858 1858
         
1859 1859
         $result = $d2->diff($d1);
1860
-        if($result !== false) {
1860
+        if ($result !== false) {
1861 1861
             return $result;
1862 1862
         }
1863 1863
         
Please login to merge, or discard this patch.