Merge branch 'master' into 2.0-dev

Author: mbabker

Tests/InflectorTest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 

Tests/NormaliseTest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 

Tests/StringHelperTest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 

src/Inflector.php

@@ -2,7 +2,7 @@
 /**
  * Part of the Joomla Framework String Package
  *
- * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 

src/Normalise.php

@@ -2,7 +2,7 @@
 /**
  * Part of the Joomla Framework String Package
  *
- * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 

src/StringHelper.php

@@ -2,7 +2,7 @@
 /**
  * Part of the Joomla Framework String Package
  *
- * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -130,7 +130,7 @@ public static function is_ascii($str)
 	 *
 	 * @return  integer Unicode ordinal for the character
 	 *
-	 * @link    https://secure.php.net/ord
+	 * @link    https://www.php.net/ord
 	 * @since   1.4.0
 	 */
 	public static function ord($chr)
@@ -147,9 +147,9 @@ public static function ord($chr)
 	 * @param   string   $search  String being searched for
 	 * @param   integer  $offset  Optional, specifies the position from which the search should be performed
 	 *
-	 * @return  mixed  Number of characters before the first match or FALSE on failure
+	 * @return  integer|boolean  Number of characters before the first match or FALSE on failure
 	 *
-	 * @link    https://secure.php.net/strpos
+	 * @link    https://www.php.net/strpos
 	 * @since   1.3.0
 	 */
 	public static function strpos($str, $search, $offset = false)
@@ -171,9 +171,9 @@ public static function strpos($str, $search, $offset = false)
 	 * @param   string   $search  String being searched for.
 	 * @param   integer  $offset  Offset from the left of the string.
 	 *
-	 * @return  mixed  Number of characters before the last match or false on failure
+	 * @return  integer|boolean  Number of characters before the last match or false on failure
 	 *
-	 * @link    https://secure.php.net/strrpos
+	 * @link    https://www.php.net/strrpos
 	 * @since   1.3.0
 	 */
 	public static function strrpos($str, $search, $offset = 0)
@@ -190,9 +190,9 @@ public static function strrpos($str, $search, $offset = 0)
 	 * @param   integer  $offset  Number of UTF-8 characters offset (from left)
 	 * @param   integer  $length  Optional length in UTF-8 characters from offset
 	 *
-	 * @return  mixed string or FALSE if failure
+	 * @return  string|boolean
 	 *
-	 * @link    https://secure.php.net/substr
+	 * @link    https://www.php.net/substr
 	 * @since   1.3.0
 	 */
 	public static function substr($str, $offset, $length = false)
@@ -215,9 +215,9 @@ public static function substr($str, $offset, $length = false)
 	 *
 	 * @param   string  $str  String being processed
 	 *
-	 * @return  mixed  Either string in lowercase or FALSE is UTF-8 invalid
+	 * @return  string|boolean  Either string in lowercase or FALSE is UTF-8 invalid
 	 *
-	 * @link    https://secure.php.net/strtolower
+	 * @link    https://www.php.net/strtolower
 	 * @since   1.3.0
 	 */
 	public static function strtolower($str)
@@ -235,9 +235,9 @@ public static function strtolower($str)
 	 *
 	 * @param   string  $str  String being processed
 	 *
-	 * @return  mixed  Either string in uppercase or FALSE is UTF-8 invalid
+	 * @return  string|boolean  Either string in uppercase or FALSE is UTF-8 invalid
 	 *
-	 * @link    https://secure.php.net/strtoupper
+	 * @link    https://www.php.net/strtoupper
 	 * @since   1.3.0
 	 */
 	public static function strtoupper($str)
@@ -254,7 +254,7 @@ public static function strtoupper($str)
 	 *
 	 * @return  integer  Number of UTF-8 characters in string.
 	 *
-	 * @link    https://secure.php.net/strlen
+	 * @link    https://www.php.net/strlen
 	 * @since   1.3.0
 	 */
 	public static function strlen($str)
@@ -274,7 +274,7 @@ public static function strlen($str)
 	 *
 	 * @return  string  UTF-8 String
 	 *
-	 * @link    https://secure.php.net/str_ireplace
+	 * @link    https://www.php.net/str_ireplace
 	 * @since   1.3.0
 	 */
 	public static function str_ireplace($search, $replace, $str, $count = null)
@@ -300,7 +300,7 @@ public static function str_ireplace($search, $replace, $str, $count = null)
 	 *
 	 * @return  string
 	 *
-	 * @link    https://secure.php.net/str_pad
+	 * @link    https://www.php.net/str_pad
 	 * @since   1.4.0
 	 */
 	public static function str_pad($input, $length, $padStr = ' ', $type = STR_PAD_RIGHT)
@@ -318,7 +318,7 @@ public static function str_pad($input, $length, $padStr = ' ', $type = STR_PAD_R
 	 *
 	 * @return  array
 	 *
-	 * @link    https://secure.php.net/str_split
+	 * @link    https://www.php.net/str_split
 	 * @since   1.3.0
 	 */
 	public static function str_split($str, $splitLen = 1)
@@ -337,9 +337,9 @@ public static function str_split($str, $splitLen = 1)
 	 *
 	 * @return  integer   < 0 if str1 is less than str2; > 0 if str1 is greater than str2, and 0 if they are equal.
 	 *
-	 * @link    https://secure.php.net/strcasecmp
-	 * @link    https://secure.php.net/strcoll
-	 * @link    https://secure.php.net/setlocale
+	 * @link    https://www.php.net/strcasecmp
+	 * @link    https://www.php.net/strcoll
+	 * @link    https://www.php.net/setlocale
 	 * @since   1.3.0
 	 */
 	public static function strcasecmp($str1, $str2, $locale = false)
@@ -394,9 +394,9 @@ public static function strcasecmp($str1, $str2, $locale = false)
 	 *
 	 * @return  integer  < 0 if str1 is less than str2; > 0 if str1 is greater than str2, and 0 if they are equal.
 	 *
-	 * @link    https://secure.php.net/strcmp
-	 * @link    https://secure.php.net/strcoll
-	 * @link    https://secure.php.net/setlocale
+	 * @link    https://www.php.net/strcmp
+	 * @link    https://www.php.net/strcoll
+	 * @link    https://www.php.net/setlocale
 	 * @since   1.3.0
 	 */
 	public static function strcmp($str1, $str2, $locale = false)
@@ -449,7 +449,7 @@ public static function strcmp($str1, $str2, $locale = false)
 	 *
 	 * @return  integer  The length of the initial segment of str1 which does not contain any of the characters in str2
 	 *
-	 * @link    https://secure.php.net/strcspn
+	 * @link    https://www.php.net/strcspn
 	 * @since   1.3.0
 	 */
 	public static function strcspn($str, $mask, $start = null, $length = null)
@@ -478,7 +478,7 @@ public static function strcspn($str, $mask, $start = null, $length = null)
 	 *
 	 * @return string the sub string
 	 *
-	 * @link    https://secure.php.net/stristr
+	 * @link    https://www.php.net/stristr
 	 * @since   1.3.0
 	 */
 	public static function stristr($str, $search)
@@ -495,7 +495,7 @@ public static function stristr($str, $search)
 	 *
 	 * @return  string   The string in reverse character order
 	 *
-	 * @link    https://secure.php.net/strrev
+	 * @link    https://www.php.net/strrev
 	 * @since   1.3.0
 	 */
 	public static function strrev($str)
@@ -515,7 +515,7 @@ public static function strrev($str)
 	 *
 	 * @return  integer
 	 *
-	 * @link    https://secure.php.net/strspn
+	 * @link    https://www.php.net/strspn
 	 * @since   1.3.0
 	 */
 	public static function strspn($str, $mask, $start = null, $length = null)
@@ -545,7 +545,7 @@ public static function strspn($str, $mask, $start = null, $length = null)
 	 *
 	 * @return  string
 	 *
-	 * @link    https://secure.php.net/substr_replace
+	 * @link    https://www.php.net/substr_replace
 	 * @since   1.3.0
 	 */
 	public static function substr_replace($str, $repl, $start, $length = null)
@@ -570,7 +570,7 @@ public static function substr_replace($str, $repl, $start, $length = null)
 	 *
 	 * @return  string  The trimmed string
 	 *
-	 * @link    https://secure.php.net/ltrim
+	 * @link    https://www.php.net/ltrim
 	 * @since   1.3.0
 	 */
 	public static function ltrim($str, $charlist = false)
@@ -599,7 +599,7 @@ public static function ltrim($str, $charlist = false)
 	 *
 	 * @return  string  The trimmed string
 	 *
-	 * @link    https://secure.php.net/rtrim
+	 * @link    https://www.php.net/rtrim
 	 * @since   1.3.0
 	 */
 	public static function rtrim($str, $charlist = false)
@@ -628,7 +628,7 @@ public static function rtrim($str, $charlist = false)
 	 *
 	 * @return  string  The trimmed string
 	 *
-	 * @link    https://secure.php.net/trim
+	 * @link    https://www.php.net/trim
 	 * @since   1.3.0
 	 */
 	public static function trim($str, $charlist = false)
@@ -659,7 +659,7 @@ public static function trim($str, $charlist = false)
 	 *                  else consider the string of words separated by the delimiter, apply the ucfirst to each words
 	 *                  and return the string with the new delimiter
 	 *
-	 * @link    https://secure.php.net/ucfirst
+	 * @link    https://www.php.net/ucfirst
 	 * @since   1.3.0
 	 */
 	public static function ucfirst($str, $delimiter = null, $newDelimiter = null)
@@ -686,7 +686,7 @@ public static function ucfirst($str, $delimiter = null, $newDelimiter = null)
 	 *
 	 * @return  string  String with first char of each word uppercase
 	 *
-	 * @link    https://secure.php.net/ucwords
+	 * @link    https://www.php.net/ucwords
 	 * @since   1.3.0
 	 */
 	public static function ucwords($str)
@@ -755,7 +755,7 @@ public static function valid($str)
 	 * @return  boolean  TRUE if string is valid UTF-8
 	 *
 	 * @see     StringHelper::valid
-	 * @link    https://secure.php.net/manual/en/reference.pcre.pattern.modifiers.php#54805
+	 * @link    https://www.php.net/manual/en/reference.pcre.pattern.modifiers.php#54805
 	 * @since   1.3.0
 	 */
 	public static function compliant($str)

src/phputf8/utf8.php

@@ -42,7 +42,7 @@
      * and https://github.com/php/php-src/commit/97df99a6d7d96a886ac143337fecad775907589a
      * for additional references
      */
-    if ( PHP_VERSION_ID < 80000 && ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING ) {
+    if ( PHP_VERSION_ID < 80000 && ((int) ini_get('mbstring.func_overload')) & MB_OVERLOAD_STRING ) {
         trigger_error('String functions are overloaded by mbstring',E_USER_ERROR);
     }
     mb_internal_encoding('UTF-8');