Imported Upstream version 5.3.1upstream/5.3.1

1 files changed, 49 insertions, 49 deletions

diff --git a/ext/spl/tests/arrayObject___construct_basic2.phpt b/ext/spl/tests/arrayObject___construct_basic2.phpt
index e5200b32f..9ff0e4257 100644
--- a/ext/spl/tests/arrayObject___construct_basic2.phpt
+++ b/ext/spl/tests/arrayObject___construct_basic2.phpt
@@ -1,52 +1,52 @@
---TEST--

-SPL: ArrayObject::__construct basic usage.

---FILE--

-<?php

-class C {

-	public $prop = 'C::prop.orig';

-}

-

-class MyArrayObject extends ArrayObject {

-	public $prop = 'MyArrayObject::prop.orig';

-}	

-

-echo "--> Access prop on instance of ArrayObject:\n";

-$c = new C;

-$ao = new ArrayObject($c);

-testAccess($c, $ao);

-

-echo "\n--> Access prop on instance of MyArrayObject:\n";

-$c = new C;

-$ao = new MyArrayObject($c);

-testAccess($c, $ao);

-

-function testAccess($c, $ao) {

-	echo "  - Iteration:\n";

-	foreach ($ao as $key=>$value) {

-		echo "      $key=>$value\n";

-	}

-

-	echo "  - Read:\n";

-	@var_dump($ao->prop, $ao['prop']);

-	

-	echo "  - Write:\n";

-	$ao->prop = 'changed1';

-	$ao['prop'] = 'changed2';

-	var_dump($ao->prop, $ao['prop']);

-	

-	echo "  - Isset:\n";

-	var_dump(isset($ao->prop), isset($ao['prop']));

-	

-	echo "  - Unset:\n";

-	unset($ao->prop);

-	unset($ao['prop']);

-	var_dump($ao->prop, $ao['prop']);

-	

-	echo "  - After:\n";

-	var_dump($ao, $c);

-}

-?>

---EXPECTF--

+--TEST--
+SPL: ArrayObject::__construct basic usage.
+--FILE--
+<?php
+class C {
+	public $prop = 'C::prop.orig';
+}
+
+class MyArrayObject extends ArrayObject {
+	public $prop = 'MyArrayObject::prop.orig';
+}	
+
+echo "--> Access prop on instance of ArrayObject:\n";
+$c = new C;
+$ao = new ArrayObject($c);
+testAccess($c, $ao);
+
+echo "\n--> Access prop on instance of MyArrayObject:\n";
+$c = new C;
+$ao = new MyArrayObject($c);
+testAccess($c, $ao);
+
+function testAccess($c, $ao) {
+	echo "  - Iteration:\n";
+	foreach ($ao as $key=>$value) {
+		echo "      $key=>$value\n";
+	}
+
+	echo "  - Read:\n";
+	@var_dump($ao->prop, $ao['prop']);
+	
+	echo "  - Write:\n";
+	$ao->prop = 'changed1';
+	$ao['prop'] = 'changed2';
+	var_dump($ao->prop, $ao['prop']);
+	
+	echo "  - Isset:\n";
+	var_dump(isset($ao->prop), isset($ao['prop']));
+	
+	echo "  - Unset:\n";
+	unset($ao->prop);
+	unset($ao['prop']);
+	var_dump($ao->prop, $ao['prop']);
+	
+	echo "  - After:\n";
+	var_dump($ao, $c);
+}
+?>
+--EXPECTF--
 --> Access prop on instance of ArrayObject:
   - Iteration:
       prop=>C::prop.orig