@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $amount = substr_count($line, "\t") - $min; |
69 | 69 | $line = trim($line); |
70 | 70 | if ($amount >= 1) { |
71 | - $line = str_repeat("\t", $amount) . $line; |
|
71 | + $line = str_repeat("\t", $amount).$line; |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | $converted[] = $line; |
@@ -140,10 +140,10 @@ discard block |
||
140 | 140 | |
141 | 141 | // specifically handle zero |
142 | 142 | if ($seconds <= 0) { |
143 | - return '0 ' . t('seconds'); |
|
143 | + return '0 '.t('seconds'); |
|
144 | 144 | } |
145 | 145 | |
146 | - if($seconds < 1) { |
|
146 | + if ($seconds < 1) { |
|
147 | 147 | return t('less than a second'); |
148 | 148 | } |
149 | 149 | |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | foreach ($units as $def) { |
152 | 152 | $quot = intval($seconds / $def['value']); |
153 | 153 | if ($quot) { |
154 | - $item = $quot . ' '; |
|
154 | + $item = $quot.' '; |
|
155 | 155 | if (abs($quot) > 1) { |
156 | 156 | $item .= $def['plural']; |
157 | 157 | } else { |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | return $last; |
169 | 169 | } |
170 | 170 | |
171 | - return implode(', ', $tokens) . ' ' . t('and') . ' ' . $last; |
|
171 | + return implode(', ', $tokens).' '.t('and').' '.$last; |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | /** |
@@ -185,11 +185,11 @@ discard block |
||
185 | 185 | */ |
186 | 186 | public static function duration2string($datefrom, $dateto = -1) |
187 | 187 | { |
188 | - if($datefrom instanceof \DateTime) { |
|
188 | + if ($datefrom instanceof \DateTime) { |
|
189 | 189 | $datefrom = ConvertHelper::date2timestamp($datefrom); |
190 | 190 | } |
191 | 191 | |
192 | - if($dateto instanceof \DateTime) { |
|
192 | + if ($dateto instanceof \DateTime) { |
|
193 | 193 | $dateto = ConvertHelper::date2timestamp($dateto); |
194 | 194 | } |
195 | 195 | |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | $interval = ""; |
211 | 211 | |
212 | 212 | $future = false; |
213 | - if($difference < 0) { |
|
213 | + if ($difference < 0) { |
|
214 | 214 | $difference = $difference * -1; |
215 | 215 | $future = true; |
216 | 216 | } |
@@ -285,7 +285,7 @@ discard block |
||
285 | 285 | $day = (int)date("j", $dateto); |
286 | 286 | $year = (int)date("Y", $datefrom); |
287 | 287 | |
288 | - while(mktime($hour, $min, $sec, $month + ($months_difference), $day, $year) < $dateto) |
|
288 | + while (mktime($hour, $min, $sec, $month + ($months_difference), $day, $year) < $dateto) |
|
289 | 289 | { |
290 | 290 | $months_difference++; |
291 | 291 | } |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | $datediff--; |
301 | 301 | } |
302 | 302 | |
303 | - if($future) { |
|
303 | + if ($future) { |
|
304 | 304 | $result = ($datediff == 1) ? t('In one month', $datediff) : t('In %1s months', $datediff); |
305 | 305 | } else { |
306 | 306 | $result = ($datediff == 1) ? t('One month ago', $datediff) : t('%1s months ago', $datediff); |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | |
310 | 310 | case "y": |
311 | 311 | $datediff = floor($difference / 60 / 60 / 24 / 365); |
312 | - if($future) { |
|
312 | + if ($future) { |
|
313 | 313 | $result = ($datediff == 1) ? t('In one year', $datediff) : t('In %1s years', $datediff); |
314 | 314 | } else { |
315 | 315 | $result = ($datediff == 1) ? t('One year ago', $datediff) : t('%1s years ago', $datediff); |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | |
319 | 319 | case "d": |
320 | 320 | $datediff = floor($difference / 60 / 60 / 24); |
321 | - if($future) { |
|
321 | + if ($future) { |
|
322 | 322 | $result = ($datediff == 1) ? t('In one day', $datediff) : t('In %1s days', $datediff); |
323 | 323 | } else { |
324 | 324 | $result = ($datediff == 1) ? t('One day ago', $datediff) : t('%1s days ago', $datediff); |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | |
328 | 328 | case "ww": |
329 | 329 | $datediff = floor($difference / 60 / 60 / 24 / 7); |
330 | - if($future) { |
|
330 | + if ($future) { |
|
331 | 331 | $result = ($datediff == 1) ? t('In one week', $datediff) : t('In %1s weeks', $datediff); |
332 | 332 | } else { |
333 | 333 | $result = ($datediff == 1) ? t('One week ago', $datediff) : t('%1s weeks ago', $datediff); |
@@ -336,7 +336,7 @@ discard block |
||
336 | 336 | |
337 | 337 | case "h": |
338 | 338 | $datediff = floor($difference / 60 / 60); |
339 | - if($future) { |
|
339 | + if ($future) { |
|
340 | 340 | $result = ($datediff == 1) ? t('In one hour', $datediff) : t('In %1s hours', $datediff); |
341 | 341 | } else { |
342 | 342 | $result = ($datediff == 1) ? t('One hour ago', $datediff) : t('%1s hours ago', $datediff); |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | |
346 | 346 | case "n": |
347 | 347 | $datediff = floor($difference / 60); |
348 | - if($future) { |
|
348 | + if ($future) { |
|
349 | 349 | $result = ($datediff == 1) ? t('In one minute', $datediff) : t('In %1s minutes', $datediff); |
350 | 350 | } else { |
351 | 351 | $result = ($datediff == 1) ? t('One minute ago', $datediff) : t('%1s minutes ago', $datediff); |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | |
355 | 355 | case "s": |
356 | 356 | $datediff = $difference; |
357 | - if($future) { |
|
357 | + if ($future) { |
|
358 | 358 | $result = ($datediff == 1) ? t('In one second', $datediff) : t('In %1s seconds', $datediff); |
359 | 359 | } else { |
360 | 360 | $result = ($datediff == 1) ? t('One second ago', $datediff) : t('%1s seconds ago', $datediff); |
@@ -377,9 +377,9 @@ discard block |
||
377 | 377 | return $geshi->parse_code(); |
378 | 378 | } |
379 | 379 | |
380 | - public static function highlight_xml($xml, $formatSource=false) |
|
380 | + public static function highlight_xml($xml, $formatSource = false) |
|
381 | 381 | { |
382 | - if($formatSource) |
|
382 | + if ($formatSource) |
|
383 | 383 | { |
384 | 384 | $dom = new \DOMDocument(); |
385 | 385 | $dom->loadXML($xml); |
@@ -417,22 +417,22 @@ discard block |
||
417 | 417 | $terabyte = $gigabyte * 1024; |
418 | 418 | |
419 | 419 | if (($bytes >= 0) && ($bytes < $kilobyte)) { |
420 | - return $bytes . ' ' . t('B'); |
|
420 | + return $bytes.' '.t('B'); |
|
421 | 421 | |
422 | 422 | } elseif (($bytes >= $kilobyte) && ($bytes < $megabyte)) { |
423 | - return round($bytes / $kilobyte, $precision) . ' ' . t('Kb'); |
|
423 | + return round($bytes / $kilobyte, $precision).' '.t('Kb'); |
|
424 | 424 | |
425 | 425 | } elseif (($bytes >= $megabyte) && ($bytes < $gigabyte)) { |
426 | - return round($bytes / $megabyte, $precision) . ' ' . t('Mb'); |
|
426 | + return round($bytes / $megabyte, $precision).' '.t('Mb'); |
|
427 | 427 | |
428 | 428 | } elseif (($bytes >= $gigabyte) && ($bytes < $terabyte)) { |
429 | - return round($bytes / $gigabyte, $precision) . ' ' . t('Gb'); |
|
429 | + return round($bytes / $gigabyte, $precision).' '.t('Gb'); |
|
430 | 430 | |
431 | 431 | } elseif ($bytes >= $terabyte) { |
432 | - return round($bytes / $gigabyte, $precision) . ' ' . t('Tb'); |
|
432 | + return round($bytes / $gigabyte, $precision).' '.t('Tb'); |
|
433 | 433 | } |
434 | 434 | |
435 | - return $bytes . ' ' . t('B'); |
|
435 | + return $bytes.' '.t('B'); |
|
436 | 436 | } |
437 | 437 | |
438 | 438 | /** |
@@ -452,34 +452,34 @@ discard block |
||
452 | 452 | return $text; |
453 | 453 | } |
454 | 454 | |
455 | - $text = trim(mb_substr($text, 0, $targetLength)) . $append; |
|
455 | + $text = trim(mb_substr($text, 0, $targetLength)).$append; |
|
456 | 456 | |
457 | 457 | return $text; |
458 | 458 | } |
459 | 459 | |
460 | - public static function var_dump($var, $html=true) |
|
460 | + public static function var_dump($var, $html = true) |
|
461 | 461 | { |
462 | 462 | $info = parseVariable($var); |
463 | 463 | |
464 | - if($html) { |
|
464 | + if ($html) { |
|
465 | 465 | return $info->toHTML(); |
466 | 466 | } |
467 | 467 | |
468 | 468 | return $info->toString(); |
469 | 469 | } |
470 | 470 | |
471 | - public static function print_r($var, $return=false, $html=true) |
|
471 | + public static function print_r($var, $return = false, $html = true) |
|
472 | 472 | { |
473 | 473 | $result = self::var_dump($var, $html); |
474 | 474 | |
475 | - if($html) { |
|
475 | + if ($html) { |
|
476 | 476 | $result = |
477 | 477 | '<pre style="background:#fff;color:#333;padding:16px;border:solid 1px #bbb;border-radius:4px">'. |
478 | 478 | $result. |
479 | 479 | '</pre>'; |
480 | 480 | } |
481 | 481 | |
482 | - if($return) { |
|
482 | + if ($return) { |
|
483 | 483 | return $result; |
484 | 484 | } |
485 | 485 | |
@@ -499,7 +499,7 @@ discard block |
||
499 | 499 | |
500 | 500 | public static function string2bool($string) |
501 | 501 | { |
502 | - if($string === '' || $string === null) { |
|
502 | + if ($string === '' || $string === null) { |
|
503 | 503 | return false; |
504 | 504 | } |
505 | 505 | |
@@ -554,10 +554,10 @@ discard block |
||
554 | 554 | public static function date2listLabel(\DateTime $date, $includeTime = false, $shortMonth = false) |
555 | 555 | { |
556 | 556 | $today = new \DateTime(); |
557 | - if($date->format('d.m.Y') == $today->format('d.m.Y')) { |
|
557 | + if ($date->format('d.m.Y') == $today->format('d.m.Y')) { |
|
558 | 558 | $label = t('Today'); |
559 | 559 | } else { |
560 | - $label = $date->format('d') . '. ' . self::month2string((int)$date->format('m'), $shortMonth) . ' '; |
|
560 | + $label = $date->format('d').'. '.self::month2string((int)$date->format('m'), $shortMonth).' '; |
|
561 | 561 | if ($date->format('Y') != date('Y')) { |
562 | 562 | $label .= $date->format('Y'); |
563 | 563 | } |
@@ -648,28 +648,28 @@ discard block |
||
648 | 648 | $hexAlphabet = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'); |
649 | 649 | |
650 | 650 | $stack = array(); |
651 | - foreach(self::$controlChars as $char) |
|
651 | + foreach (self::$controlChars as $char) |
|
652 | 652 | { |
653 | 653 | $tokens = explode('-', $char); |
654 | 654 | $start = $tokens[0]; |
655 | 655 | $end = $tokens[1]; |
656 | 656 | $prefix = substr($start, 0, 3); |
657 | 657 | $range = array(); |
658 | - foreach($hexAlphabet as $number) { |
|
658 | + foreach ($hexAlphabet as $number) { |
|
659 | 659 | $range[] = $prefix.$number; |
660 | 660 | } |
661 | 661 | |
662 | 662 | $use = false; |
663 | - foreach($range as $number) { |
|
664 | - if($number == $start) { |
|
663 | + foreach ($range as $number) { |
|
664 | + if ($number == $start) { |
|
665 | 665 | $use = true; |
666 | 666 | } |
667 | 667 | |
668 | - if($use) { |
|
668 | + if ($use) { |
|
669 | 669 | $stack[] = $number; |
670 | 670 | } |
671 | 671 | |
672 | - if($number == $end) { |
|
672 | + if ($number == $end) { |
|
673 | 673 | break; |
674 | 674 | } |
675 | 675 | } |
@@ -690,7 +690,7 @@ discard block |
||
690 | 690 | $chars = self::getControlCharactersAsHex(); |
691 | 691 | |
692 | 692 | $result = array(); |
693 | - foreach($chars as $char) { |
|
693 | + foreach ($chars as $char) { |
|
694 | 694 | $result[] = hex2bin($char); |
695 | 695 | } |
696 | 696 | |
@@ -708,14 +708,14 @@ discard block |
||
708 | 708 | $chars = self::getControlCharactersAsHex(); |
709 | 709 | |
710 | 710 | $result = array(); |
711 | - foreach($chars as $char) { |
|
711 | + foreach ($chars as $char) { |
|
712 | 712 | $result[] = '\u'.strtolower($char); |
713 | 713 | } |
714 | 714 | |
715 | 715 | return $result; |
716 | 716 | } |
717 | 717 | |
718 | - protected static $controlChars = array( |
|
718 | + protected static $controlChars = array( |
|
719 | 719 | '0000-0008', // control chars |
720 | 720 | '000E-000F', // control chars |
721 | 721 | '0010-001F', // control chars |
@@ -737,19 +737,19 @@ discard block |
||
737 | 737 | */ |
738 | 738 | public static function stripControlCharacters(string $string) : string |
739 | 739 | { |
740 | - if(empty($string)) { |
|
740 | + if (empty($string)) { |
|
741 | 741 | return $string; |
742 | 742 | } |
743 | 743 | |
744 | 744 | // create the regex from the unicode characters list |
745 | - if(!isset(self::$controlCharsRegex)) |
|
745 | + if (!isset(self::$controlCharsRegex)) |
|
746 | 746 | { |
747 | 747 | $chars = self::getControlCharactersAsHex(); |
748 | 748 | |
749 | 749 | // we use the notation \x{0000} to specify the unicode character key |
750 | 750 | // in the regular expression. |
751 | 751 | $stack = array(); |
752 | - foreach($chars as $char) { |
|
752 | + foreach ($chars as $char) { |
|
753 | 753 | $stack[] = '\x{'.$char.'}'; |
754 | 754 | } |
755 | 755 | |
@@ -783,7 +783,7 @@ discard block |
||
783 | 783 | $ordInt = ord($octet); |
784 | 784 | // Convert from int (base 10) to hex (base 16), for PHP \x syntax |
785 | 785 | $ordHex = base_convert($ordInt, 10, 16); |
786 | - $output .= '\x' . $ordHex; |
|
786 | + $output .= '\x'.$ordHex; |
|
787 | 787 | } |
788 | 788 | return $output; |
789 | 789 | } |
@@ -815,19 +815,19 @@ discard block |
||
815 | 815 | |
816 | 816 | protected static function convertScalarForComparison($scalar) |
817 | 817 | { |
818 | - if($scalar === '' || is_null($scalar)) { |
|
818 | + if ($scalar === '' || is_null($scalar)) { |
|
819 | 819 | return null; |
820 | 820 | } |
821 | 821 | |
822 | - if(is_bool($scalar)) { |
|
822 | + if (is_bool($scalar)) { |
|
823 | 823 | return self::bool2string($scalar); |
824 | 824 | } |
825 | 825 | |
826 | - if(is_array($scalar)) { |
|
826 | + if (is_array($scalar)) { |
|
827 | 827 | $scalar = md5(serialize($scalar)); |
828 | 828 | } |
829 | 829 | |
830 | - if($scalar !== null && !is_scalar($scalar)) { |
|
830 | + if ($scalar !== null && !is_scalar($scalar)) { |
|
831 | 831 | throw new ConvertHelper_Exception( |
832 | 832 | 'Not a scalar value in comparison', |
833 | 833 | null, |
@@ -876,7 +876,7 @@ discard block |
||
876 | 876 | public static function bool2string($boolean, bool $yesno = false) : string |
877 | 877 | { |
878 | 878 | // allow 'yes', 'true', 'no', 'false' string notations as well |
879 | - if(!is_bool($boolean)) { |
|
879 | + if (!is_bool($boolean)) { |
|
880 | 880 | $boolean = self::string2bool($boolean); |
881 | 881 | } |
882 | 882 | |
@@ -917,15 +917,15 @@ discard block |
||
917 | 917 | public static function array2attributeString($array) |
918 | 918 | { |
919 | 919 | $tokens = array(); |
920 | - foreach($array as $attr => $value) { |
|
921 | - if($value == '' || $value == null) { |
|
920 | + foreach ($array as $attr => $value) { |
|
921 | + if ($value == '' || $value == null) { |
|
922 | 922 | continue; |
923 | 923 | } |
924 | 924 | |
925 | 925 | $tokens[] = $attr.'="'.$value.'"'; |
926 | 926 | } |
927 | 927 | |
928 | - if(empty($tokens)) { |
|
928 | + if (empty($tokens)) { |
|
929 | 929 | return ''; |
930 | 930 | } |
931 | 931 | |
@@ -940,10 +940,10 @@ discard block |
||
940 | 940 | * @param string $string |
941 | 941 | * @return string |
942 | 942 | */ |
943 | - public static function string2attributeJS($string, $quoted=true) |
|
943 | + public static function string2attributeJS($string, $quoted = true) |
|
944 | 944 | { |
945 | 945 | $converted = addslashes(htmlspecialchars(strip_tags($string), ENT_QUOTES, 'UTF-8')); |
946 | - if($quoted) { |
|
946 | + if ($quoted) { |
|
947 | 947 | $converted = "'".$converted."'"; |
948 | 948 | } |
949 | 949 | |
@@ -961,11 +961,11 @@ discard block |
||
961 | 961 | */ |
962 | 962 | public static function isBoolean($value) : bool |
963 | 963 | { |
964 | - if(is_bool($value)) { |
|
964 | + if (is_bool($value)) { |
|
965 | 965 | return true; |
966 | 966 | } |
967 | 967 | |
968 | - if(!is_scalar($value)) { |
|
968 | + if (!is_scalar($value)) { |
|
969 | 969 | return false; |
970 | 970 | } |
971 | 971 | |
@@ -981,7 +981,7 @@ discard block |
||
981 | 981 | public static function array2styleString(array $subject) : string |
982 | 982 | { |
983 | 983 | $tokens = array(); |
984 | - foreach($subject as $name => $value) { |
|
984 | + foreach ($subject as $name => $value) { |
|
985 | 985 | $tokens[] = $name.':'.$value; |
986 | 986 | } |
987 | 987 | |
@@ -1046,7 +1046,7 @@ discard block |
||
1046 | 1046 | * @param string $regex |
1047 | 1047 | * @return array |
1048 | 1048 | */ |
1049 | - public static function regex2js($regex, $return=self::JS_REGEX_OBJECT) |
|
1049 | + public static function regex2js($regex, $return = self::JS_REGEX_OBJECT) |
|
1050 | 1050 | { |
1051 | 1051 | $regex = trim($regex); |
1052 | 1052 | $separator = substr($regex, 0, 1); |
@@ -1054,7 +1054,7 @@ discard block |
||
1054 | 1054 | array_shift($parts); |
1055 | 1055 | |
1056 | 1056 | $modifiers = array_pop($parts); |
1057 | - if($modifiers == $separator) { |
|
1057 | + if ($modifiers == $separator) { |
|
1058 | 1058 | $modifiers = ''; |
1059 | 1059 | } |
1060 | 1060 | |
@@ -1070,14 +1070,14 @@ discard block |
||
1070 | 1070 | // convert the anchors that are not supported in js regexes |
1071 | 1071 | $format = str_replace(array('\\A', '\\Z', '\\z'), array('^', '$', ''), $format); |
1072 | 1072 | |
1073 | - if($return==self::JS_REGEX_JSON) { |
|
1073 | + if ($return == self::JS_REGEX_JSON) { |
|
1074 | 1074 | return json_encode(array( |
1075 | 1075 | 'format' => $format, |
1076 | 1076 | 'modifiers' => $modifiers |
1077 | 1077 | )); |
1078 | 1078 | } |
1079 | 1079 | |
1080 | - if(!empty($modifiers)) { |
|
1080 | + if (!empty($modifiers)) { |
|
1081 | 1081 | return sprintf( |
1082 | 1082 | 'new RegExp(%s, %s)', |
1083 | 1083 | json_encode($format), |
@@ -1100,10 +1100,10 @@ discard block |
||
1100 | 1100 | public static function stripUTFBom($string) |
1101 | 1101 | { |
1102 | 1102 | $boms = FileHelper::getUTFBOMs(); |
1103 | - foreach($boms as $bomChars) { |
|
1103 | + foreach ($boms as $bomChars) { |
|
1104 | 1104 | $length = mb_strlen($bomChars); |
1105 | 1105 | $text = mb_substr($string, 0, $length); |
1106 | - if($text==$bomChars) { |
|
1106 | + if ($text == $bomChars) { |
|
1107 | 1107 | return mb_substr($string, $length); |
1108 | 1108 | } |
1109 | 1109 | } |
@@ -1120,7 +1120,7 @@ discard block |
||
1120 | 1120 | */ |
1121 | 1121 | public static function string2utf8($string) |
1122 | 1122 | { |
1123 | - if(!self::isStringASCII($string)) { |
|
1123 | + if (!self::isStringASCII($string)) { |
|
1124 | 1124 | return \ForceUTF8\Encoding::toUTF8($string); |
1125 | 1125 | } |
1126 | 1126 | |
@@ -1138,11 +1138,11 @@ discard block |
||
1138 | 1138 | */ |
1139 | 1139 | public static function isStringASCII($string) |
1140 | 1140 | { |
1141 | - if($string === '' || $string === NULL) { |
|
1141 | + if ($string === '' || $string === NULL) { |
|
1142 | 1142 | return true; |
1143 | 1143 | } |
1144 | 1144 | |
1145 | - if(!is_string($string)) { |
|
1145 | + if (!is_string($string)) { |
|
1146 | 1146 | return false; |
1147 | 1147 | } |
1148 | 1148 | |
@@ -1176,7 +1176,7 @@ discard block |
||
1176 | 1176 | * @param array $options |
1177 | 1177 | * @return float |
1178 | 1178 | */ |
1179 | - public static function matchString($source, $target, $options=array()) |
|
1179 | + public static function matchString($source, $target, $options = array()) |
|
1180 | 1180 | { |
1181 | 1181 | $defaults = array( |
1182 | 1182 | 'maxLevenshtein' => 10, |
@@ -1186,12 +1186,12 @@ discard block |
||
1186 | 1186 | $options = array_merge($defaults, $options); |
1187 | 1187 | |
1188 | 1188 | // avoid doing this via levenshtein |
1189 | - if($source == $target) { |
|
1189 | + if ($source == $target) { |
|
1190 | 1190 | return 100; |
1191 | 1191 | } |
1192 | 1192 | |
1193 | 1193 | $diff = levenshtein($source, $target); |
1194 | - if($diff > $options['maxLevenshtein']) { |
|
1194 | + if ($diff > $options['maxLevenshtein']) { |
|
1195 | 1195 | return 0; |
1196 | 1196 | } |
1197 | 1197 | |
@@ -1205,8 +1205,8 @@ discard block |
||
1205 | 1205 | |
1206 | 1206 | $offset = 0; |
1207 | 1207 | $keep = array(); |
1208 | - foreach($tokens as $token) { |
|
1209 | - if($interval->$token > 0) { |
|
1208 | + foreach ($tokens as $token) { |
|
1209 | + if ($interval->$token > 0) { |
|
1210 | 1210 | $keep = array_slice($tokens, $offset); |
1211 | 1211 | break; |
1212 | 1212 | } |
@@ -1215,16 +1215,16 @@ discard block |
||
1215 | 1215 | } |
1216 | 1216 | |
1217 | 1217 | $parts = array(); |
1218 | - foreach($keep as $token) |
|
1218 | + foreach ($keep as $token) |
|
1219 | 1219 | { |
1220 | 1220 | $value = $interval->$token; |
1221 | 1221 | $label = ''; |
1222 | 1222 | |
1223 | 1223 | $suffix = 'p'; |
1224 | - if($value == 1) { $suffix = 's'; } |
|
1224 | + if ($value == 1) { $suffix = 's'; } |
|
1225 | 1225 | $token .= $suffix; |
1226 | 1226 | |
1227 | - switch($token) { |
|
1227 | + switch ($token) { |
|
1228 | 1228 | case 'ys': $label = t('1 year'); break; |
1229 | 1229 | case 'yp': $label = t('%1$s years', $value); break; |
1230 | 1230 | case 'ms': $label = t('1 month'); break; |
@@ -1242,7 +1242,7 @@ discard block |
||
1242 | 1242 | $parts[] = $label; |
1243 | 1243 | } |
1244 | 1244 | |
1245 | - if(count($parts) == 1) { |
|
1245 | + if (count($parts) == 1) { |
|
1246 | 1246 | return $parts[0]; |
1247 | 1247 | } |
1248 | 1248 | |
@@ -1267,23 +1267,23 @@ discard block |
||
1267 | 1267 | * @param string $unit |
1268 | 1268 | * @return integer |
1269 | 1269 | */ |
1270 | - public static function interval2total(\DateInterval $interval, $unit=self::INTERVAL_SECONDS) |
|
1270 | + public static function interval2total(\DateInterval $interval, $unit = self::INTERVAL_SECONDS) |
|
1271 | 1271 | { |
1272 | 1272 | $total = $interval->format('%a'); |
1273 | 1273 | if ($unit == self::INTERVAL_DAYS) { |
1274 | 1274 | return $total; |
1275 | 1275 | } |
1276 | 1276 | |
1277 | - $total = ($total * 24) + ($interval->h ); |
|
1277 | + $total = ($total * 24) + ($interval->h); |
|
1278 | 1278 | if ($unit == self::INTERVAL_HOURS) { |
1279 | 1279 | return $total; |
1280 | 1280 | } |
1281 | 1281 | |
1282 | - $total = ($total * 60) + ($interval->i ); |
|
1282 | + $total = ($total * 60) + ($interval->i); |
|
1283 | 1283 | if ($unit == self::INTERVAL_MINUTES) |
1284 | 1284 | return $total; |
1285 | 1285 | |
1286 | - $total = ($total * 60) + ($interval->s ); |
|
1286 | + $total = ($total * 60) + ($interval->s); |
|
1287 | 1287 | if ($unit == self::INTERVAL_SECONDS) |
1288 | 1288 | return $total; |
1289 | 1289 | |
@@ -1311,13 +1311,13 @@ discard block |
||
1311 | 1311 | * @param string $short |
1312 | 1312 | * @return string|NULL |
1313 | 1313 | */ |
1314 | - public static function date2dayName(\DateTime $date, $short=false) |
|
1314 | + public static function date2dayName(\DateTime $date, $short = false) |
|
1315 | 1315 | { |
1316 | 1316 | $day = $date->format('l'); |
1317 | 1317 | $invariant = self::getDayNamesInvariant(); |
1318 | 1318 | |
1319 | 1319 | $idx = array_search($day, $invariant); |
1320 | - if($idx !== false) { |
|
1320 | + if ($idx !== false) { |
|
1321 | 1321 | $localized = self::getDayNames($short); |
1322 | 1322 | return $localized[$idx]; |
1323 | 1323 | } |
@@ -1340,10 +1340,10 @@ discard block |
||
1340 | 1340 | * @param string $short |
1341 | 1341 | * @return string[] |
1342 | 1342 | */ |
1343 | - public static function getDayNames($short=false) |
|
1343 | + public static function getDayNames($short = false) |
|
1344 | 1344 | { |
1345 | - if($short) { |
|
1346 | - if(!isset(self::$daysShort)) { |
|
1345 | + if ($short) { |
|
1346 | + if (!isset(self::$daysShort)) { |
|
1347 | 1347 | self::$daysShort = array( |
1348 | 1348 | t('Mon'), |
1349 | 1349 | t('Tue'), |
@@ -1358,7 +1358,7 @@ discard block |
||
1358 | 1358 | return self::$daysShort; |
1359 | 1359 | } |
1360 | 1360 | |
1361 | - if(!isset(self::$days)) { |
|
1361 | + if (!isset(self::$days)) { |
|
1362 | 1362 | self::$days = array( |
1363 | 1363 | t('Monday'), |
1364 | 1364 | t('Tuesday'), |
@@ -1383,17 +1383,17 @@ discard block |
||
1383 | 1383 | */ |
1384 | 1384 | public static function implodeWithAnd(array $list, $sep = ', ', $conjunction = null) |
1385 | 1385 | { |
1386 | - if(empty($list)) { |
|
1386 | + if (empty($list)) { |
|
1387 | 1387 | return ''; |
1388 | 1388 | } |
1389 | 1389 | |
1390 | - if(empty($conjunction)) { |
|
1390 | + if (empty($conjunction)) { |
|
1391 | 1391 | $conjunction = t('and'); |
1392 | 1392 | } |
1393 | 1393 | |
1394 | 1394 | $last = array_pop($list); |
1395 | - if($list) { |
|
1396 | - return implode($sep, $list) . $conjunction . ' ' . $last; |
|
1395 | + if ($list) { |
|
1396 | + return implode($sep, $list).$conjunction.' '.$last; |
|
1397 | 1397 | } |
1398 | 1398 | |
1399 | 1399 | return $last; |
@@ -1410,7 +1410,7 @@ discard block |
||
1410 | 1410 | public static function string2array(string $string) : array |
1411 | 1411 | { |
1412 | 1412 | $result = preg_split('//u', $string, null, PREG_SPLIT_NO_EMPTY); |
1413 | - if($result !== false) { |
|
1413 | + if ($result !== false) { |
|
1414 | 1414 | return $result; |
1415 | 1415 | } |
1416 | 1416 | |
@@ -1425,12 +1425,12 @@ discard block |
||
1425 | 1425 | */ |
1426 | 1426 | public static function isStringHTML(string $string) : bool |
1427 | 1427 | { |
1428 | - if(preg_match('%<[a-z/][\s\S]*>%siU', $string)) { |
|
1428 | + if (preg_match('%<[a-z/][\s\S]*>%siU', $string)) { |
|
1429 | 1429 | return true; |
1430 | 1430 | } |
1431 | 1431 | |
1432 | 1432 | $decoded = html_entity_decode($string); |
1433 | - if($decoded !== $string) { |
|
1433 | + if ($decoded !== $string) { |
|
1434 | 1434 | return true; |
1435 | 1435 | } |
1436 | 1436 | |
@@ -1567,7 +1567,7 @@ discard block |
||
1567 | 1567 | // extract parameter names from the query string |
1568 | 1568 | $result = array(); |
1569 | 1569 | preg_match_all('/&?([^&]+)=.*/sixU', $queryString, $result, PREG_PATTERN_ORDER); |
1570 | - if(isset($result[1])) { |
|
1570 | + if (isset($result[1])) { |
|
1571 | 1571 | $paramNames = $result[1]; |
1572 | 1572 | } |
1573 | 1573 | |
@@ -1590,11 +1590,11 @@ discard block |
||
1590 | 1590 | // possible naming conflicts like having both parameters "foo.bar" |
1591 | 1591 | // and "foo_bar" in the query string: since "foo.bar" would be converted |
1592 | 1592 | // to "foo_bar", one of the two would be replaced. |
1593 | - if($fixRequired) |
|
1593 | + if ($fixRequired) |
|
1594 | 1594 | { |
1595 | 1595 | $counter = 1; |
1596 | 1596 | $placeholders = array(); |
1597 | - foreach($paramNames as $paramName) |
|
1597 | + foreach ($paramNames as $paramName) |
|
1598 | 1598 | { |
1599 | 1599 | // create a unique placeholder name |
1600 | 1600 | $placeholder = '__PLACEHOLDER'.$counter.'__'; |
@@ -1624,13 +1624,13 @@ discard block |
||
1624 | 1624 | parse_str($queryString, $parsed); |
1625 | 1625 | |
1626 | 1626 | // do any of the parameter names need to be fixed? |
1627 | - if(!$fixRequired) { |
|
1627 | + if (!$fixRequired) { |
|
1628 | 1628 | return $parsed; |
1629 | 1629 | } |
1630 | 1630 | |
1631 | 1631 | $keep = array(); |
1632 | 1632 | |
1633 | - foreach($parsed as $name => $value) |
|
1633 | + foreach ($parsed as $name => $value) |
|
1634 | 1634 | { |
1635 | 1635 | $keep[$table[$name]] = $value; |
1636 | 1636 | } |
@@ -1649,14 +1649,14 @@ discard block |
||
1649 | 1649 | * @param bool $caseInsensitive |
1650 | 1650 | * @return ConvertHelper_StringMatch[] |
1651 | 1651 | */ |
1652 | - public static function findString(string $needle, string $haystack, bool $caseInsensitive=false) |
|
1652 | + public static function findString(string $needle, string $haystack, bool $caseInsensitive = false) |
|
1653 | 1653 | { |
1654 | - if($needle === '') { |
|
1654 | + if ($needle === '') { |
|
1655 | 1655 | return array(); |
1656 | 1656 | } |
1657 | 1657 | |
1658 | 1658 | $function = 'mb_strpos'; |
1659 | - if($caseInsensitive) { |
|
1659 | + if ($caseInsensitive) { |
|
1660 | 1660 | $function = 'mb_stripos'; |
1661 | 1661 | } |
1662 | 1662 | |
@@ -1664,7 +1664,7 @@ discard block |
||
1664 | 1664 | $positions = array(); |
1665 | 1665 | $length = mb_strlen($needle); |
1666 | 1666 | |
1667 | - while( ($pos = $function($haystack, $needle, $pos)) !== false) |
|
1667 | + while (($pos = $function($haystack, $needle, $pos)) !== false) |
|
1668 | 1668 | { |
1669 | 1669 | $match = mb_substr($haystack, $pos, $length); |
1670 | 1670 | $positions[] = new ConvertHelper_StringMatch($pos, $match); |
@@ -1684,7 +1684,7 @@ discard block |
||
1684 | 1684 | */ |
1685 | 1685 | public static function explodeTrim(string $delimiter, string $string) : array |
1686 | 1686 | { |
1687 | - if(empty($string) || empty($delimiter)) { |
|
1687 | + if (empty($string) || empty($delimiter)) { |
|
1688 | 1688 | return array(); |
1689 | 1689 | } |
1690 | 1690 | |
@@ -1692,8 +1692,8 @@ discard block |
||
1692 | 1692 | $tokens = array_map('trim', $tokens); |
1693 | 1693 | |
1694 | 1694 | $keep = array(); |
1695 | - foreach($tokens as $token) { |
|
1696 | - if($token !== '') { |
|
1695 | + foreach ($tokens as $token) { |
|
1696 | + if ($token !== '') { |
|
1697 | 1697 | $keep[] = $token; |
1698 | 1698 | } |
1699 | 1699 | } |
@@ -1711,11 +1711,11 @@ discard block |
||
1711 | 1711 | */ |
1712 | 1712 | public static function detectEOLCharacter(string $subjectString) : ?ConvertHelper_EOL |
1713 | 1713 | { |
1714 | - if(empty($subjectString)) { |
|
1714 | + if (empty($subjectString)) { |
|
1715 | 1715 | return null; |
1716 | 1716 | } |
1717 | 1717 | |
1718 | - if(!isset(self::$eolChars)) |
|
1718 | + if (!isset(self::$eolChars)) |
|
1719 | 1719 | { |
1720 | 1720 | $cr = chr((int)hexdec('0d')); |
1721 | 1721 | $lf = chr((int)hexdec('0a')); |
@@ -1746,18 +1746,18 @@ discard block |
||
1746 | 1746 | |
1747 | 1747 | $max = 0; |
1748 | 1748 | $results = array(); |
1749 | - foreach(self::$eolChars as $def) |
|
1749 | + foreach (self::$eolChars as $def) |
|
1750 | 1750 | { |
1751 | 1751 | $amount = substr_count($subjectString, $def['char']); |
1752 | 1752 | |
1753 | - if($amount > $max) |
|
1753 | + if ($amount > $max) |
|
1754 | 1754 | { |
1755 | 1755 | $max = $amount; |
1756 | 1756 | $results[] = $def; |
1757 | 1757 | } |
1758 | 1758 | } |
1759 | 1759 | |
1760 | - if(empty($results)) { |
|
1760 | + if (empty($results)) { |
|
1761 | 1761 | return null; |
1762 | 1762 | } |
1763 | 1763 | |
@@ -1777,9 +1777,9 @@ discard block |
||
1777 | 1777 | */ |
1778 | 1778 | public static function arrayRemoveKeys(array &$array, array $keys) : void |
1779 | 1779 | { |
1780 | - foreach($keys as $key) |
|
1780 | + foreach ($keys as $key) |
|
1781 | 1781 | { |
1782 | - if(array_key_exists($key, $array)) { |
|
1782 | + if (array_key_exists($key, $array)) { |
|
1783 | 1783 | unset($array[$key]); |
1784 | 1784 | } |
1785 | 1785 | } |