Amend array tests

Author: Girgias

ext/standard/tests/array/array_combine_variation4.phpt

@@ -52,7 +52,7 @@ $arrays = array (
 
        // array with mixed keys
 /*11*/ array('hello' => 1, "fruit" => 2.2,
-             $fp => 'resource', 133 => "int", 444.432 => "float",
+             $fp => 'resource', 133 => "int",
              @$unset_var => "unset", $heredoc => "heredoc")
 );
 
@@ -81,8 +81,6 @@ echo "Done";
 Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d
 
 Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d
-
-Deprecated: Implicit conversion from non-compatible float 444.432 to int in %s on line %d
 -- Iteration 1 --
 array(0) {
 }
@@ -144,7 +142,7 @@ array(2) {
   string(8) "resource"
 }
 -- Iteration 9 --
-array(7) {
+array(6) {
   [1]=>
   int(1)
   ["2.2"]=>
@@ -153,8 +151,6 @@ array(7) {
   string(8) "resource"
   ["int"]=>
   string(3) "int"
-  ["float"]=>
-  string(5) "float"
   ["unset"]=>
   string(5) "unset"
   ["heredoc"]=>

ext/standard/tests/array/array_fill.phpt

@@ -2,7 +2,7 @@
 basic array_fill test
 --FILE--
 <?php
-$array1 = array(0.0, 1, 2.5);
+$array1 = array(0.0, 1, 2);
 $array2 = array(TRUE, FALSE, NULL, "d", "e", "f");
 foreach($array1 as $start)
 {
@@ -18,7 +18,7 @@ foreach($array1 as $start)
    }
 }
 ?>
---EXPECTF--
+--EXPECT--
 ===========================
 bool(true)
 start: 0 num: 0 value: array(0) {
@@ -81,59 +81,47 @@ start: 0 num: 1 value: array(1) {
 }
 ===========================
 bool(true)
-start: 0 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 0 num: 2 value: array(2) {
   [0]=>
   bool(true)
   [1]=>
   bool(true)
 }
 ===========================
 bool(false)
-start: 0 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 0 num: 2 value: array(2) {
   [0]=>
   bool(false)
   [1]=>
   bool(false)
 }
 ===========================
 NULL
-start: 0 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 0 num: 2 value: array(2) {
   [0]=>
   NULL
   [1]=>
   NULL
 }
 ===========================
 string(1) "d"
-start: 0 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 0 num: 2 value: array(2) {
   [0]=>
   string(1) "d"
   [1]=>
   string(1) "d"
 }
 ===========================
 string(1) "e"
-start: 0 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 0 num: 2 value: array(2) {
   [0]=>
   string(1) "e"
   [1]=>
   string(1) "e"
 }
 ===========================
 string(1) "f"
-start: 0 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 0 num: 2 value: array(2) {
   [0]=>
   string(1) "f"
   [1]=>
@@ -201,215 +189,155 @@ start: 1 num: 1 value: array(1) {
 }
 ===========================
 bool(true)
-start: 1 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 1 num: 2 value: array(2) {
   [1]=>
   bool(true)
   [2]=>
   bool(true)
 }
 ===========================
 bool(false)
-start: 1 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 1 num: 2 value: array(2) {
   [1]=>
   bool(false)
   [2]=>
   bool(false)
 }
 ===========================
 NULL
-start: 1 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 1 num: 2 value: array(2) {
   [1]=>
   NULL
   [2]=>
   NULL
 }
 ===========================
 string(1) "d"
-start: 1 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 1 num: 2 value: array(2) {
   [1]=>
   string(1) "d"
   [2]=>
   string(1) "d"
 }
 ===========================
 string(1) "e"
-start: 1 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 1 num: 2 value: array(2) {
   [1]=>
   string(1) "e"
   [2]=>
   string(1) "e"
 }
 ===========================
 string(1) "f"
-start: 1 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 1 num: 2 value: array(2) {
   [1]=>
   string(1) "f"
   [2]=>
   string(1) "f"
 }
 ===========================
 bool(true)
-start: 2.5 num: 0 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(0) {
+start: 2 num: 0 value: array(0) {
 }
 ===========================
 bool(false)
-start: 2.5 num: 0 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(0) {
+start: 2 num: 0 value: array(0) {
 }
 ===========================
 NULL
-start: 2.5 num: 0 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(0) {
+start: 2 num: 0 value: array(0) {
 }
 ===========================
 string(1) "d"
-start: 2.5 num: 0 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(0) {
+start: 2 num: 0 value: array(0) {
 }
 ===========================
 string(1) "e"
-start: 2.5 num: 0 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(0) {
+start: 2 num: 0 value: array(0) {
 }
 ===========================
 string(1) "f"
-start: 2.5 num: 0 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(0) {
+start: 2 num: 0 value: array(0) {
 }
 ===========================
 bool(true)
-start: 2.5 num: 1 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(1) {
+start: 2 num: 1 value: array(1) {
   [2]=>
   bool(true)
 }
 ===========================
 bool(false)
-start: 2.5 num: 1 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(1) {
+start: 2 num: 1 value: array(1) {
   [2]=>
   bool(false)
 }
 ===========================
 NULL
-start: 2.5 num: 1 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(1) {
+start: 2 num: 1 value: array(1) {
   [2]=>
   NULL
 }
 ===========================
 string(1) "d"
-start: 2.5 num: 1 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(1) {
+start: 2 num: 1 value: array(1) {
   [2]=>
   string(1) "d"
 }
 ===========================
 string(1) "e"
-start: 2.5 num: 1 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(1) {
+start: 2 num: 1 value: array(1) {
   [2]=>
   string(1) "e"
 }
 ===========================
 string(1) "f"
-start: 2.5 num: 1 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(1) {
+start: 2 num: 1 value: array(1) {
   [2]=>
   string(1) "f"
 }
 ===========================
 bool(true)
-start: 2.5 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 2 num: 2 value: array(2) {
   [2]=>
   bool(true)
   [3]=>
   bool(true)
 }
 ===========================
 bool(false)
-start: 2.5 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 2 num: 2 value: array(2) {
   [2]=>
   bool(false)
   [3]=>
   bool(false)
 }
 ===========================
 NULL
-start: 2.5 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 2 num: 2 value: array(2) {
   [2]=>
   NULL
   [3]=>
   NULL
 }
 ===========================
 string(1) "d"
-start: 2.5 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 2 num: 2 value: array(2) {
   [2]=>
   string(1) "d"
   [3]=>
   string(1) "d"
 }
 ===========================
 string(1) "e"
-start: 2.5 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 2 num: 2 value: array(2) {
   [2]=>
   string(1) "e"
   [3]=>
   string(1) "e"
 }
 ===========================
 string(1) "f"
-start: 2.5 num: 2.5 value: 
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-
-Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
-array(2) {
+start: 2 num: 2 value: array(2) {
   [2]=>
   string(1) "f"
   [3]=>

ext/standard/tests/array/array_intersect_assoc_variation5.phpt

@@ -42,11 +42,11 @@ $arrays = array (
 
        // array with mixed keys
 /*11*/ array('hello' => 1, "fruit" => 2.2,
-              133 => "int", 444.432 => "float",
+              133 => "int",
              @$unset_var => "unset", $heredoc => "heredoc")
 );
 
-// array to be passsed to $arr2 argument
+// array to be passed to $arr2 argument
 $arr2 = array(0 => 0, 2 => "float", 4 => "f3", 33333333 => "f4",
               "\tHello" => 111, 2.2, 'color', "Hello world" => "string",
               "pen\n" => 33,  133 => "int");
@@ -67,10 +67,8 @@ foreach($arrays as $arr1) {
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing array_intersect_assoc() : assoc array with diff keys to $arr1 argument ***
-
-Deprecated: Implicit conversion from non-compatible float 444.432 to int in %s on line %d
 -- Iteration 1 --
 array(0) {
 }