Merge branch 'master' into 2.0-dev

Author: mbabker

.travis.yml

@@ -19,10 +19,9 @@ matrix:
     - php: 7.3
       # This empty flag removes the prefer-stable switch to cause dev dependencies to be installed
       env: COMPOSER_FLAGS=""
-    - php: 7.4snapshot
+    - php: 7.4
     - php: nightly
   allow_failures:
-    - php: 7.4snapshot
     - php: nightly
 
 before_script:

src/Normalise.php

@@ -120,18 +120,13 @@ public static function toUnderscoreSeparated($input)
 	public static function toVariable($input)
 	{
 		// Remove dashes and underscores, then convert to camel case.
-		$input = static::toSpaceSeparated($input);
 		$input = static::toCamelCase($input);
 
 		// Remove leading digits.
 		$input = preg_replace('#^[0-9]+#', '', $input);
 
 		// Lowercase the first character.
-		$first = substr($input, 0, 1);
-		$first = strtolower($first);
-
-		// Replace the first character with the lowercase character.
-		$input = substr_replace($input, $first, 0, 1);
+		$input = lcfirst($input);
 
 		return $input;
 	}

src/phputf8/utils/unicode.php

@@ -24,6 +24,12 @@
 * and raises a PHP error at level E_USER_WARNING
 * Note: this function has been modified slightly in this library to
 * trigger errors on encountering bad bytes
+*
+* Joomla modification - As of PHP 7.4, curly brace access has been deprecated. As a result this function has been
+* modified to use square brace syntax
+* See https://github.com/php/php-src/commit/d574df63dc375f5fc9202ce5afde23f866b6450a
+* for additional references
+*
 * @author <hsivonen@iki.fi>
 * @param string UTF-8 encoded string
 * @return mixed array of unicode code points or FALSE if UTF-8 invalid
@@ -43,7 +49,7 @@ function utf8_to_unicode($str) {
 
     for($i = 0; $i < $len; $i++) {
 
-        $in = ord($str{$i});
+        $in = ord($str[$i]);
 
         if ( $mState == 0) {