Merge branch '3.x-dev' into 4.x-dev

Author: richard67

phpstan-baseline.neon

@@ -0,0 +1,40 @@
+parameters:
+	excludePaths:
+		analyse:
+			-	src/phputf8/*
+	ignoreErrors:
+		-
+			message: "#^Call to deprecated method rules\\(\\) of class Doctrine\\\\Common\\\\Inflector\\\\Inflector\\.$#"
+			count: 1
+			path: src/Inflector.php
+
+		-
+			message: """
+				#^Call to deprecated method toPlural\\(\\) of class Joomla\\\\String\\\\Inflector\\:
+				3\\.0  Use Doctrine\\\\Common\\\\Inflector\\\\Inflector\\:\\:pluralize\\(\\) instead\\.$#
+			"""
+			count: 1
+			path: src/Inflector.php
+
+		-
+			message: """
+				#^Call to deprecated method toSingular\\(\\) of class Joomla\\\\String\\\\Inflector\\:
+				3\\.0  Use Doctrine\\\\Common\\\\Inflector\\\\Inflector\\:\\:singularize\\(\\) instead\\.$#
+			"""
+			count: 2
+			path: src/Inflector.php
+
+		-
+			message: "#^Class Joomla\\\\String\\\\Inflector extends deprecated class Doctrine\\\\Common\\\\Inflector\\\\Inflector\\.$#"
+			count: 1
+			path: src/Inflector.php
+
+		-
+			message: "#^Method Joomla\\\\String\\\\Inflector\\:\\:getInstance\\(\\) should return static\\(Joomla\\\\String\\\\Inflector\\) but returns Joomla\\\\String\\\\Inflector\\.$#"
+			count: 1
+			path: src/Inflector.php
+
+		-
+			message: "#^Unsafe usage of new static\\(\\)\\.$#"
+			count: 2
+			path: src/Inflector.php

phpstan.neon

@@ -1,6 +1,7 @@
 
 includes:
 	- vendor/phpstan/phpstan-deprecation-rules/rules.neon
+	- phpstan-baseline.neon
 
 parameters:
 	level: 5

src/StringHelper.php

@@ -375,7 +375,7 @@ public static function strcasecmp($str1, $str2, $locale = false)
         }
 
         // Get current locale
-        $locale0 = setlocale(LC_COLLATE, null);
+        $locale0 = setlocale(LC_COLLATE, '0');
 
         if (!$locale = setlocale(LC_COLLATE, $locale)) {
             $locale = $locale0;
@@ -421,7 +421,7 @@ public static function strcmp($str1, $str2, $locale = false)
     {
         if ($locale) {
             // Get current locale
-            $locale0 = setlocale(LC_COLLATE, null);
+            $locale0 = setlocale(LC_COLLATE, '0');
 
             if (!$locale = setlocale(LC_COLLATE, $locale)) {
                 $locale = $locale0;