Merge pull request laravel#5449 from crynobone/patch/revert-fluent

taylorotwell · taylorotwell · commit d0dac6970320 · 2014-09-08T11:00:04.000-05:00
Completely revert "remove useless contructor" changes on Illuminate\Support\Fluent where it doesn't respect object that implements IteratorAggregate and ArrayIterator.
diff --git a/src/Illuminate/Support/Fluent.php b/src/Illuminate/Support/Fluent.php
@@ -22,7 +22,10 @@ class Fluent implements ArrayAccess, ArrayableInterface, JsonableInterface, Json
 	 */
 	public function __construct($attributes = array())
 	{
-		$this->attributes = (array) $attributes;
+		foreach ($attributes as $key => $value)
+		{
+			$this->attributes[$key] = $value;
+		}
 	}
 
 	/**
diff --git a/tests/Support/SupportFluentTest.php b/tests/Support/SupportFluentTest.php
@@ -24,14 +24,13 @@ public function testAttributesAreSetByConstructor()
 
 
 	/**
-	 * Test the Fluent constructor.
+	 * Test the Fluent constructor when given \stdClass/object.
 	 *
 	 * @test
 	 */
 	public function testAttributesAreSetByConstructorGivenStdClass()
 	{
 		$array  = array('name' => 'Taylor', 'age' => 25);
-
 		$fluent = new Fluent((object) $array);
 
 		$refl = new \ReflectionObject($fluent);
@@ -43,6 +42,25 @@ public function testAttributesAreSetByConstructorGivenStdClass()
 	}
 
 
+	/**
+	 * Test the Fluent constructor when given ArrayIterator interface.
+	 *
+	 * @test
+	 */
+	public function testAttributesAreSetByConstructorGivenArrayIterator()
+	{
+		$array  = array('name' => 'Taylor', 'age' => 25);
+		$fluent = new Fluent(new FluentArrayIteratorStub($array));
+
+		$refl = new \ReflectionObject($fluent);
+		$attributes = $refl->getProperty('attributes');
+		$attributes->setAccessible(true);
+
+		$this->assertEquals($array, $attributes->getValue($fluent));
+		$this->assertEquals($array, $fluent->getAttributes());
+	}
+
+
 	/**
 	 * Test the Fluent::get() method.
 	 *
@@ -114,3 +132,18 @@ public function testToJsonEncodesTheToArrayResult()
 		$this->assertEquals(json_encode('foo'), $results);
 	}
 }
+
+
+class FluentArrayIteratorStub implements \IteratorAggregate {
+	protected $items = array();
+
+	public function __construct(array $items = array())
+	{
+		$this->items = (array) $items;
+	}
+
+	public function getIterator()
+	{
+		return new \ArrayIterator($this->items);
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,10 @@ class Fluent implements ArrayAccess, ArrayableInterface, JsonableInterface, Json`
`22`	`22`	`*/`
`23`	`23`	`public function __construct($attributes = array())`
`24`	`24`	`{`
`25`		`- $this->attributes = (array) $attributes;`
	`25`	`+ foreach ($attributes as $key => $value)`
	`26`	`+ {`
	`27`	`+ $this->attributes[$key] = $value;`
	`28`	`+ }`
`26`	`29`	`}`
`27`	`30`
`28`	`31`	`/**`