summaryrefslogtreecommitdiff
path: root/ext/standard/tests/array/array_merge.phpt
diff options
context:
space:
mode:
authorGabriel Caruso <carusogabriel34@gmail.com>2018-09-16 14:16:42 -0300
committerGabriel Caruso <carusogabriel34@gmail.com>2018-10-14 12:07:20 -0300
commit9c144e0d8217d1ef7a83c2498214308b21af749f (patch)
treed977ba0d8601de477c52f62accf02c120ef06253 /ext/standard/tests/array/array_merge.phpt
parentb419732ddb0673dc5b15a67ee4bc7f06dd90d7d0 (diff)
downloadphp-git-9c144e0d8217d1ef7a83c2498214308b21af749f.tar.gz
Trim trailing whitespace in tests
Diffstat (limited to 'ext/standard/tests/array/array_merge.phpt')
-rw-r--r--ext/standard/tests/array/array_merge.phpt10
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/standard/tests/array/array_merge.phpt b/ext/standard/tests/array/array_merge.phpt
index 245f59e745..205260b2a5 100644
--- a/ext/standard/tests/array/array_merge.phpt
+++ b/ext/standard/tests/array/array_merge.phpt
@@ -16,7 +16,7 @@ $begin_array = array(
array( -2.44444 => 12),
array( "a" => 1, "b" => -2.344, "b" => "string", "c" => NULL, "d" => -2.344),
array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL,1 => -2.344),
- array( NULL, 1.23 => "Hi", "string" => "hello",
+ array( NULL, 1.23 => "Hi", "string" => "hello",
array("" => "World", "-2.34" => "a", "0" => "b"))
);
@@ -27,7 +27,7 @@ $end_array = array(
array( -2.44444 => 12),
array( "a" => 1, "b" => -2.344, "b" => "string", "c" => NULL, "d" => -2.344),
array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL, 1=> -2.344),
- array( NULL, 1.23 => "Hi", "string" => "hello",
+ array( NULL, 1.23 => "Hi", "string" => "hello",
array("" => "World", "-2.34" => "a", "0" => "b"))
);
@@ -41,7 +41,7 @@ foreach($begin_array as $first) {
$result = array_merge($first, $second);
print_r($result);
$count_inner++;
- }
+ }
$count_outer++;
}
@@ -64,7 +64,7 @@ var_dump( array_merge( $end_array[0],
echo "\n*** Testing single array argument ***\n";
/* Empty array */
-var_dump(array_merge(array()));
+var_dump(array_merge(array()));
/* associative array with string keys, which will not be re-indexed */
var_dump(array_merge($begin_array[4]));
@@ -86,7 +86,7 @@ var_dump(array_merge($begin_array[0], $begin_array[1], 100));
var_dump(array_merge($begin_array[0], $begin_array[1], $arr4));
echo "Done\n";
-?>
+?>
--EXPECTF--
*** Testing array_merge() basic functionality ***