Several codestyle fixes

Hackwar · Hackwar · commit 37537b981e9e · 2023-01-31T23:05:34.000+01:00
diff --git a/Tests/InflectorTest.php b/Tests/InflectorTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright  Copyright (C) 2005 - 2021 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
diff --git a/Tests/NormaliseTest.php b/Tests/NormaliseTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright  Copyright (C) 2005 - 2021 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
diff --git a/Tests/StringHelperTest.php b/Tests/StringHelperTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright  Copyright (C) 2005 - 2021 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
diff --git a/src/Inflector.php b/src/Inflector.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Part of the Joomla Framework String Package
  *
diff --git a/src/Normalise.php b/src/Normalise.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Part of the Joomla Framework String Package
  *
diff --git a/src/StringHelper.php b/src/StringHelper.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Part of the Joomla Framework String Package
  *
diff --git a/src/phputf8/mbstring/core.php b/src/phputf8/mbstring/core.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * @package utf8
 */
diff --git a/src/phputf8/native/core.php b/src/phputf8/native/core.php
diff --git a/src/phputf8/ord.php b/src/phputf8/ord.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * @package utf8
 */
@@ -87,7 +88,7 @@ function utf8_ord($chr)
     }
 
     if ($ord0 >= 254 && $ord0 <= 255) {
-        trigger_error('Invalid UTF-8 with surrogate ordinal '.$ord0);
+        trigger_error('Invalid UTF-8 with surrogate ordinal ' . $ord0);
         return false;
     }
 }
diff --git a/src/phputf8/str_ireplace.php b/src/phputf8/str_ireplace.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * @package utf8
 */
@@ -33,7 +34,7 @@ function utf8_ireplace($search, $replace, $str, $count = null)
         $lstr    = utf8_strtolower($str);
         $i       = 0;
         $matched = 0;
-        while (preg_match('/(.*)'.$search.'/Us', $lstr, $matches)) {
+        while (preg_match('/(.*)' . $search . '/Us', $lstr, $matches)) {
             if ($i === $count) {
                 break;
             }
diff --git a/src/phputf8/str_pad.php b/src/phputf8/str_pad.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * @package utf8
 */
diff --git a/src/phputf8/str_split.php b/src/phputf8/str_split.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * @package utf8
 */
@@ -26,6 +27,6 @@ function utf8_str_split($str, $split_len = 1)
         return [$str];
     }
 
-    preg_match_all('/.{'.$split_len.'}|[^\x00]{1,'.$split_len.'}$/us', $str, $ar);
+    preg_match_all('/.{' . $split_len . '}|[^\x00]{1,' . $split_len . '}$/us', $str, $ar);
     return $ar[0];
 }
diff --git a/src/phputf8/strcasecmp.php b/src/phputf8/strcasecmp.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * @package utf8
 */
diff --git a/src/phputf8/strcspn.php b/src/phputf8/strcspn.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * @package utf8
 */
@@ -26,7 +27,7 @@ function utf8_strcspn($str, $mask, $start = null, $length = null)
         $str = utf8_substr($str, $start, $length);
     }
 
-    preg_match('/^[^'.$mask.']+/u', $str, $matches);
+    preg_match('/^[^' . $mask . ']+/u', $str, $matches);
 
     if (isset($matches[0])) {
         return utf8_strlen($matches[0]);
diff --git a/src/phputf8/stristr.php b/src/phputf8/stristr.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * @package utf8
 */
@@ -24,7 +25,7 @@ function utf8_stristr($str, $search)
     $lstr    = utf8_strtolower($str);
     $lsearch = utf8_strtolower($search);
     //JOOMLA SPECIFIC FIX - BEGIN
-    preg_match('/^(.*)'.preg_quote($lsearch, '/').'/Us', $lstr, $matches);
+    preg_match('/^(.*)' . preg_quote($lsearch, '/') . '/Us', $lstr, $matches);
     //JOOMLA SPECIFIC FIX - END
 
     if (count($matches) == 2) {
diff --git a/src/phputf8/strrev.php b/src/phputf8/strrev.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * @package utf8
 */
diff --git a/src/phputf8/strspn.php b/src/phputf8/strspn.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * @package utf8
 */
@@ -26,7 +27,7 @@ function utf8_strspn($str, $mask, $start = null, $length = null)
         $str = utf8_substr($str, $start, $length);
     }
 
-    preg_match('/^['.$mask.']+/u', $str, $matches);
+    preg_match('/^[' . $mask . ']+/u', $str, $matches);
 
     if (isset($matches[0])) {
         return utf8_strlen($matches[0]);
diff --git a/src/phputf8/substr_replace.php b/src/phputf8/substr_replace.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * @package utf8
 */
diff --git a/src/phputf8/trim.php b/src/phputf8/trim.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * @package utf8
 */
@@ -24,7 +25,7 @@ function utf8_ltrim($str, $charlist = false)
     //quote charlist for use in a characterclass
     $charlist = preg_replace('!([\\\\\\-\\]\\[/^])!', '\\\${1}', $charlist);
 
-    return preg_replace('/^['.$charlist.']+/u', '', $str);
+    return preg_replace('/^[' . $charlist . ']+/u', '', $str);
 }
 
 //---------------------------------------------------------------
@@ -48,7 +49,7 @@ function utf8_rtrim($str, $charlist = false)
     //quote charlist for use in a characterclass
     $charlist = preg_replace('!([\\\\\\-\\]\\[/^])!', '\\\${1}', $charlist);
 
-    return preg_replace('/['.$charlist.']+$/u', '', $str);
+    return preg_replace('/[' . $charlist . ']+$/u', '', $str);
 }
 
 //---------------------------------------------------------------
diff --git a/src/phputf8/ucfirst.php b/src/phputf8/ucfirst.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * @package utf8
 */
@@ -25,7 +26,7 @@ function utf8_ucfirst($str)
             break;
         default:
             preg_match('/^(.{1})(.*)$/us', $str, $matches);
-            return utf8_strtoupper($matches[1]).$matches[2];
+            return utf8_strtoupper($matches[1]) . $matches[2];
             break;
     }
 }
diff --git a/src/phputf8/ucwords.php b/src/phputf8/ucwords.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * @package utf8
 */
diff --git a/src/phputf8/utf8.php b/src/phputf8/utf8.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * This is the dynamic loader for the library. It checks whether you have
 * the mbstring extension available and includes relevant files
diff --git a/src/phputf8/utils/ascii.php b/src/phputf8/utils/ascii.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * Tools to help with ASCII in UTF-8
 *
@@ -66,11 +67,13 @@ function utf8_is_ascii_ctrl($str)
 function utf8_strip_non_ascii($str)
 {
     ob_start();
-    while (preg_match(
-        '/^([\x00-\x7F]+)|([^\x00-\x7F]+)/S',
-        $str,
-        $matches
-    )) {
+    while (
+        preg_match(
+            '/^([\x00-\x7F]+)|([^\x00-\x7F]+)/S',
+            $str,
+            $matches
+        )
+    ) {
         if (!isset($matches[2])) {
             echo $matches[0];
         }
@@ -94,11 +97,13 @@ function utf8_strip_non_ascii($str)
 function utf8_strip_ascii_ctrl($str)
 {
     ob_start();
-    while (preg_match(
-        '/^([^\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+)|([\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+)/S',
-        $str,
-        $matches
-    )) {
+    while (
+        preg_match(
+            '/^([^\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+)|([\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+)/S',
+            $str,
+            $matches
+        )
+    ) {
         if (!isset($matches[2])) {
             echo $matches[0];
         }
@@ -122,11 +127,13 @@ function utf8_strip_ascii_ctrl($str)
 function utf8_strip_non_ascii_ctrl($str)
 {
     ob_start();
-    while (preg_match(
-        '/^([\x09\x0A\x0D\x20-\x7E]+)|([^\x09\x0A\x0D\x20-\x7E]+)/S',
-        $str,
-        $matches
-    )) {
+    while (
+        preg_match(
+            '/^([\x09\x0A\x0D\x20-\x7E]+)|([^\x09\x0A\x0D\x20-\x7E]+)/S',
+            $str,
+            $matches
+        )
+    ) {
         if (!isset($matches[2])) {
             echo $matches[0];
         }
@@ -159,29 +166,29 @@ function utf8_strip_non_ascii_ctrl($str)
 * @author Andreas Gohr <andi@splitbrain.org>
 * @package utf8
 */
-function utf8_accents_to_ascii($str, $case=0)
+function utf8_accents_to_ascii($str, $case = 0)
 {
     static $UTF8_LOWER_ACCENTS = null;
     static $UTF8_UPPER_ACCENTS = null;
 
     if ($case <= 0) {
         if (is_null($UTF8_LOWER_ACCENTS)) {
             $UTF8_LOWER_ACCENTS = [
-  'à' => 'a', 'ô' => 'o', 'ď' => 'd', 'ḟ' => 'f', 'ë' => 'e', 'š' => 's', 'ơ' => 'o',
-  'ß' => 'ss', 'ă' => 'a', 'ř' => 'r', 'ț' => 't', 'ň' => 'n', 'ā' => 'a', 'ķ' => 'k',
-  'ŝ' => 's', 'ỳ' => 'y', 'ņ' => 'n', 'ĺ' => 'l', 'ħ' => 'h', 'ṗ' => 'p', 'ó' => 'o',
-  'ú' => 'u', 'ě' => 'e', 'é' => 'e', 'ç' => 'c', 'ẁ' => 'w', 'ċ' => 'c', 'õ' => 'o',
-  'ṡ' => 's', 'ø' => 'o', 'ģ' => 'g', 'ŧ' => 't', 'ș' => 's', 'ė' => 'e', 'ĉ' => 'c',
-  'ś' => 's', 'î' => 'i', 'ű' => 'u', 'ć' => 'c', 'ę' => 'e', 'ŵ' => 'w', 'ṫ' => 't',
-  'ū' => 'u', 'č' => 'c', 'ö' => 'oe', 'è' => 'e', 'ŷ' => 'y', 'ą' => 'a', 'ł' => 'l',
-  'ų' => 'u', 'ů' => 'u', 'ş' => 's', 'ğ' => 'g', 'ļ' => 'l', 'ƒ' => 'f', 'ž' => 'z',
-  'ẃ' => 'w', 'ḃ' => 'b', 'å' => 'a', 'ì' => 'i', 'ï' => 'i', 'ḋ' => 'd', 'ť' => 't',
-  'ŗ' => 'r', 'ä' => 'ae', 'í' => 'i', 'ŕ' => 'r', 'ê' => 'e', 'ü' => 'ue', 'ò' => 'o',
-  'ē' => 'e', 'ñ' => 'n', 'ń' => 'n', 'ĥ' => 'h', 'ĝ' => 'g', 'đ' => 'd', 'ĵ' => 'j',
-  'ÿ' => 'y', 'ũ' => 'u', 'ŭ' => 'u', 'ư' => 'u', 'ţ' => 't', 'ý' => 'y', 'ő' => 'o',
-  'â' => 'a', 'ľ' => 'l', 'ẅ' => 'w', 'ż' => 'z', 'ī' => 'i', 'ã' => 'a', 'ġ' => 'g',
-  'ṁ' => 'm', 'ō' => 'o', 'ĩ' => 'i', 'ù' => 'u', 'į' => 'i', 'ź' => 'z', 'á' => 'a',
-  'û' => 'u', 'þ' => 'th', 'ð' => 'dh', 'æ' => 'ae', 'µ' => 'u', 'ĕ' => 'e',
+            'à' => 'a', 'ô' => 'o', 'ď' => 'd', 'ḟ' => 'f', 'ë' => 'e', 'š' => 's', 'ơ' => 'o',
+            'ß' => 'ss', 'ă' => 'a', 'ř' => 'r', 'ț' => 't', 'ň' => 'n', 'ā' => 'a', 'ķ' => 'k',
+            'ŝ' => 's', 'ỳ' => 'y', 'ņ' => 'n', 'ĺ' => 'l', 'ħ' => 'h', 'ṗ' => 'p', 'ó' => 'o',
+            'ú' => 'u', 'ě' => 'e', 'é' => 'e', 'ç' => 'c', 'ẁ' => 'w', 'ċ' => 'c', 'õ' => 'o',
+            'ṡ' => 's', 'ø' => 'o', 'ģ' => 'g', 'ŧ' => 't', 'ș' => 's', 'ė' => 'e', 'ĉ' => 'c',
+            'ś' => 's', 'î' => 'i', 'ű' => 'u', 'ć' => 'c', 'ę' => 'e', 'ŵ' => 'w', 'ṫ' => 't',
+            'ū' => 'u', 'č' => 'c', 'ö' => 'oe', 'è' => 'e', 'ŷ' => 'y', 'ą' => 'a', 'ł' => 'l',
+            'ų' => 'u', 'ů' => 'u', 'ş' => 's', 'ğ' => 'g', 'ļ' => 'l', 'ƒ' => 'f', 'ž' => 'z',
+            'ẃ' => 'w', 'ḃ' => 'b', 'å' => 'a', 'ì' => 'i', 'ï' => 'i', 'ḋ' => 'd', 'ť' => 't',
+            'ŗ' => 'r', 'ä' => 'ae', 'í' => 'i', 'ŕ' => 'r', 'ê' => 'e', 'ü' => 'ue', 'ò' => 'o',
+            'ē' => 'e', 'ñ' => 'n', 'ń' => 'n', 'ĥ' => 'h', 'ĝ' => 'g', 'đ' => 'd', 'ĵ' => 'j',
+            'ÿ' => 'y', 'ũ' => 'u', 'ŭ' => 'u', 'ư' => 'u', 'ţ' => 't', 'ý' => 'y', 'ő' => 'o',
+            'â' => 'a', 'ľ' => 'l', 'ẅ' => 'w', 'ż' => 'z', 'ī' => 'i', 'ã' => 'a', 'ġ' => 'g',
+            'ṁ' => 'm', 'ō' => 'o', 'ĩ' => 'i', 'ù' => 'u', 'į' => 'i', 'ź' => 'z', 'á' => 'a',
+            'û' => 'u', 'þ' => 'th', 'ð' => 'dh', 'æ' => 'ae', 'µ' => 'u', 'ĕ' => 'e',
             ];
         }
 
@@ -195,21 +202,21 @@ function utf8_accents_to_ascii($str, $case=0)
     if ($case >= 0) {
         if (is_null($UTF8_UPPER_ACCENTS)) {
             $UTF8_UPPER_ACCENTS = [
-  'À' => 'A', 'Ô' => 'O', 'Ď' => 'D', 'Ḟ' => 'F', 'Ë' => 'E', 'Š' => 'S', 'Ơ' => 'O',
-  'Ă' => 'A', 'Ř' => 'R', 'Ț' => 'T', 'Ň' => 'N', 'Ā' => 'A', 'Ķ' => 'K',
-  'Ŝ' => 'S', 'Ỳ' => 'Y', 'Ņ' => 'N', 'Ĺ' => 'L', 'Ħ' => 'H', 'Ṗ' => 'P', 'Ó' => 'O',
-  'Ú' => 'U', 'Ě' => 'E', 'É' => 'E', 'Ç' => 'C', 'Ẁ' => 'W', 'Ċ' => 'C', 'Õ' => 'O',
-  'Ṡ' => 'S', 'Ø' => 'O', 'Ģ' => 'G', 'Ŧ' => 'T', 'Ș' => 'S', 'Ė' => 'E', 'Ĉ' => 'C',
-  'Ś' => 'S', 'Î' => 'I', 'Ű' => 'U', 'Ć' => 'C', 'Ę' => 'E', 'Ŵ' => 'W', 'Ṫ' => 'T',
-  'Ū' => 'U', 'Č' => 'C', 'Ö' => 'Oe', 'È' => 'E', 'Ŷ' => 'Y', 'Ą' => 'A', 'Ł' => 'L',
-  'Ų' => 'U', 'Ů' => 'U', 'Ş' => 'S', 'Ğ' => 'G', 'Ļ' => 'L', 'Ƒ' => 'F', 'Ž' => 'Z',
-  'Ẃ' => 'W', 'Ḃ' => 'B', 'Å' => 'A', 'Ì' => 'I', 'Ï' => 'I', 'Ḋ' => 'D', 'Ť' => 'T',
-  'Ŗ' => 'R', 'Ä' => 'Ae', 'Í' => 'I', 'Ŕ' => 'R', 'Ê' => 'E', 'Ü' => 'Ue', 'Ò' => 'O',
-  'Ē' => 'E', 'Ñ' => 'N', 'Ń' => 'N', 'Ĥ' => 'H', 'Ĝ' => 'G', 'Đ' => 'D', 'Ĵ' => 'J',
-  'Ÿ' => 'Y', 'Ũ' => 'U', 'Ŭ' => 'U', 'Ư' => 'U', 'Ţ' => 'T', 'Ý' => 'Y', 'Ő' => 'O',
-  'Â' => 'A', 'Ľ' => 'L', 'Ẅ' => 'W', 'Ż' => 'Z', 'Ī' => 'I', 'Ã' => 'A', 'Ġ' => 'G',
-  'Ṁ' => 'M', 'Ō' => 'O', 'Ĩ' => 'I', 'Ù' => 'U', 'Į' => 'I', 'Ź' => 'Z', 'Á' => 'A',
-  'Û' => 'U', 'Þ' => 'Th', 'Ð' => 'Dh', 'Æ' => 'Ae', 'Ĕ' => 'E',
+            'À' => 'A', 'Ô' => 'O', 'Ď' => 'D', 'Ḟ' => 'F', 'Ë' => 'E', 'Š' => 'S', 'Ơ' => 'O',
+            'Ă' => 'A', 'Ř' => 'R', 'Ț' => 'T', 'Ň' => 'N', 'Ā' => 'A', 'Ķ' => 'K',
+            'Ŝ' => 'S', 'Ỳ' => 'Y', 'Ņ' => 'N', 'Ĺ' => 'L', 'Ħ' => 'H', 'Ṗ' => 'P', 'Ó' => 'O',
+            'Ú' => 'U', 'Ě' => 'E', 'É' => 'E', 'Ç' => 'C', 'Ẁ' => 'W', 'Ċ' => 'C', 'Õ' => 'O',
+            'Ṡ' => 'S', 'Ø' => 'O', 'Ģ' => 'G', 'Ŧ' => 'T', 'Ș' => 'S', 'Ė' => 'E', 'Ĉ' => 'C',
+            'Ś' => 'S', 'Î' => 'I', 'Ű' => 'U', 'Ć' => 'C', 'Ę' => 'E', 'Ŵ' => 'W', 'Ṫ' => 'T',
+            'Ū' => 'U', 'Č' => 'C', 'Ö' => 'Oe', 'È' => 'E', 'Ŷ' => 'Y', 'Ą' => 'A', 'Ł' => 'L',
+            'Ų' => 'U', 'Ů' => 'U', 'Ş' => 'S', 'Ğ' => 'G', 'Ļ' => 'L', 'Ƒ' => 'F', 'Ž' => 'Z',
+            'Ẃ' => 'W', 'Ḃ' => 'B', 'Å' => 'A', 'Ì' => 'I', 'Ï' => 'I', 'Ḋ' => 'D', 'Ť' => 'T',
+            'Ŗ' => 'R', 'Ä' => 'Ae', 'Í' => 'I', 'Ŕ' => 'R', 'Ê' => 'E', 'Ü' => 'Ue', 'Ò' => 'O',
+            'Ē' => 'E', 'Ñ' => 'N', 'Ń' => 'N', 'Ĥ' => 'H', 'Ĝ' => 'G', 'Đ' => 'D', 'Ĵ' => 'J',
+            'Ÿ' => 'Y', 'Ũ' => 'U', 'Ŭ' => 'U', 'Ư' => 'U', 'Ţ' => 'T', 'Ý' => 'Y', 'Ő' => 'O',
+            'Â' => 'A', 'Ľ' => 'L', 'Ẅ' => 'W', 'Ż' => 'Z', 'Ī' => 'I', 'Ã' => 'A', 'Ġ' => 'G',
+            'Ṁ' => 'M', 'Ō' => 'O', 'Ĩ' => 'I', 'Ù' => 'U', 'Į' => 'I', 'Ź' => 'Z', 'Á' => 'A',
+            'Û' => 'U', 'Þ' => 'Th', 'Ð' => 'Dh', 'Æ' => 'Ae', 'Ĕ' => 'E',
             ];
         }
         $str = str_replace(
diff --git a/src/phputf8/utils/bad.php b/src/phputf8/utils/bad.php
diff --git a/src/phputf8/utils/patterns.php b/src/phputf8/utils/patterns.php
diff --git a/src/phputf8/utils/position.php b/src/phputf8/utils/position.php
diff --git a/src/phputf8/utils/specials.php b/src/phputf8/utils/specials.php
diff --git a/src/phputf8/utils/unicode.php b/src/phputf8/utils/unicode.php
diff --git a/src/phputf8/utils/validation.php b/src/phputf8/utils/validation.php

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?php`
	`2`	`+`
`2`	`3`	`/**`
`3`	`4`	`* @copyright Copyright (C) 2005 - 2021 Open Source Matters, Inc. All rights reserved.`
`4`	`5`	`* @license GNU General Public License version 2 or later; see LICENSE`