improve code

Author: nojimage

build/build-emoji-regex.php

@@ -40,7 +40,7 @@
 
 // -- modify class file
 $classContent = file_get_contents($classFile);
-$replacedClassContent = preg_replace('/(\s+const VALID_EMOJI_PATTERN = \')(?:.*)(\';)/', '$1/' . $regex . '/u$2', $classContent);
+$replacedClassContent = preg_replace('/(\s+public const VALID_EMOJI_PATTERN = \')(?:.*)(\';)/', '$1/' . $regex . '/u$2', $classContent);
 
 echo $replacedClassContent;
 

lib/Twitter/Text/Configuration.php

@@ -139,7 +139,7 @@ public function __construct(array $config = null)
      */
     public function __get($name)
     {
-        return isset($this->config[$name]) ? $this->config[$name] : null;
+        return $this->config[$name] ?? null;
     }
 
     /**

lib/Twitter/Text/EmojiRegex.php

@@ -140,11 +140,10 @@ public function highlight($tweet = null, array $hits = null)
             $offset = 0;
             $start_in_chunk = false;
             # Flatten the multidimensional hits array:
-            $hits_flat = call_user_func_array('array_merge', array_values($hits));
-            $hits_flat_count = count($hits_flat);
+            $hits_flat = array_merge(...array_values($hits));
             # Loop over the hit indices:
-            for ($index = 0; $index < $hits_flat_count; $index++) {
-                $hit = $hits_flat[$index];
+            foreach ($hits_flat as $index => $indexValue) {
+                $hit = $indexValue;
                 $tag = $tags[$index % 2];
                 $placed = false;
                 while ($chunk !== null && $hit >= ($i = $offset + StringUtils::strlen($chunk))) {
@@ -159,7 +158,7 @@ public function highlight($tweet = null, array $hits = null)
                     $offset += StringUtils::strlen($chunk);
                     $chunk_cursor = 0;
                     $chunk_index += 2;
-                    $chunk = (isset($chunks[$chunk_index]) ? $chunks[$chunk_index] : null);
+                    $chunk = $chunks[$chunk_index] ?? null;
                     $start_in_chunk = false;
                 }
                 if (!$placed && $chunk !== null) {

lib/Twitter/Text/HitHighlighter.php

@@ -106,7 +106,7 @@ public function __get($name)
             return $this->validTextRange[1];
         }
 
-        return isset($this->result[$name]) ? $this->result[$name] : null;
+        return $this->result[$name] ?? null;
     }
 
     /**

lib/Twitter/Text/ParseResults.php

@@ -30,10 +30,6 @@ class StringUtils
      */
     public static function substr($str, $start, $length = null, $encoding = 'UTF-8')
     {
-        if ($length === null) {
-            // for PHP <= 5.4.7
-            $length = mb_strlen($str, $encoding);
-        }
         return mb_substr($str, $start, $length, $encoding);
     }
 
@@ -109,12 +105,7 @@ public static function substrReplace($string, $replacement, $start, $length = nu
      */
     public static function idnToAscii($domain)
     {
-        // INTL_IDNA_VARIANT_UTS46 defined PHP 5.4.0 or later
-        if (defined('INTL_IDNA_VARIANT_UTS46')) {
-            return idn_to_ascii($domain, IDNA_ALLOW_UNASSIGNED, INTL_IDNA_VARIANT_UTS46);
-        }
-
-        return idn_to_ascii($domain, IDNA_ALLOW_UNASSIGNED);
+        return idn_to_ascii($domain, IDNA_ALLOW_UNASSIGNED, INTL_IDNA_VARIANT_UTS46);
     }
 
     /**