Rewriting the error message and moving test conditions

Author: CViniciusSDias

ext/standard/string.c

@@ -1034,7 +1034,11 @@ PHP_FUNCTION(implode)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (arg1_str != NULL && pieces == NULL) {
-		zend_type_error("%s(): Argument #2 ($array) must be of type array, null given", get_active_function_name());
+		zend_type_error(
+			"%s(): If argument #1 ($separator) is of type string, "
+			"argument #2 ($array) must be of type array, null given",
+			get_active_function_name()
+		);
 		RETURN_THROWS();
 	}
 

ext/standard/tests/strings/implode.phpt …tandard/tests/strings/implode_basic.phptext/standard/tests/strings/implode.phpt renamed to ext/standard/tests/strings/implode_basic.phpt ext/standard/tests/strings/implode.phpt renamed to ext/standard/tests/strings/implode_basic.phpt

@@ -8,27 +8,13 @@ try {
     echo $e->getMessage(), "\n";
 }
 
-/* int as pieces */
-try {
-    var_dump( implode("glue",1234) );
-} catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
-}
-
 /* NULL as pieces */
 try {
     var_dump( implode("glue", NULL) );
 } catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 
-/* pieces as NULL array */
-try {
-    var_dump( implode(",", array(NULL)) );
-} catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
-}
-
 /* integer as glue */
 try {
     var_dump( implode(12, "pieces") );
@@ -45,9 +31,7 @@ try {
 ?>
 --EXPECTF--
 implode(): Argument #2 ($array) must be of type array, null given
-implode(): Argument #2 ($array) must be of type array, int given
 implode(): Argument #2 ($array) must be of type array, null given
-string(0) ""
 implode(): Argument #2 ($array) must be of type array, string given
 
 Deprecated: implode(): Passing null to parameter #1 ($separator) of type array|string is deprecated in %s on line %d

ext/standard/tests/strings/implode_error.phpt

@@ -9,7 +9,8 @@ $arrays = array (
   array(array(2),array(1)),
   array(false,true),
   array(),
-  array("a","aaaa","b","bbbb","c","ccccccccccccccccccccc")
+  array("a","aaaa","b","bbbb","c","ccccccccccccccccccccc"),
+  array(NULL),
 );
 /* loop to output string with ', ' as $glue, using implode() */
 foreach ($arrays as $array) {
@@ -170,6 +171,11 @@ array(6) {
   [5]=>
   string(21) "ccccccccccccccccccccc"
 }
+string(0) ""
+array(1) {
+  [0]=>
+  NULL
+}
 
 *** Testing implode() with variations of glue ***
 -- Iteration 1 --