Merge remote-tracking branch 'upstream/develop' into develop

artisan

@@ -4,7 +4,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.2.2
+ * @version  3.2.3
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */

laravel/database/eloquent/relationships/belongs_to.php

@@ -89,7 +89,7 @@ public function match($relationship, &$children, $parents)
 
 		foreach ($children as &$child)
 		{
-			$parent = array_first($parents, function($k, $v) use ($child, $foreign)
+			$parent = array_first($parents, function($k, $v) use (&$child, $foreign)
 			{
 				return $v->get_key() == $child->$foreign;
 			});

laravel/database/eloquent/relationships/has_many.php

@@ -93,7 +93,7 @@ public function match($relationship, &$parents, $children)
 
 		foreach ($parents as &$parent)
 		{
-			$matching = array_filter($children, function($v) use ($parent, $foreign)
+			$matching = array_filter($children, function($v) use (&$parent, $foreign)
 			{
 				return $v->$foreign == $parent->get_key();
 			});

laravel/database/eloquent/relationships/has_many_and_belongs_to.php

@@ -327,7 +327,7 @@ public function match($relationship, &$parents, $children)
 
 		foreach ($parents as &$parent)
 		{
-			$matching = array_filter($children, function($v) use ($parent, $foreign)
+			$matching = array_filter($children, function($v) use (&$parent, $foreign)
 			{
 				return $v->pivot->$foreign == $parent->get_key();
 			});

laravel/database/eloquent/relationships/has_one.php

@@ -40,7 +40,7 @@ public function match($relationship, &$parents, $children)
 
 		foreach ($parents as &$parent)
 		{
-			$matching = array_first($children, function($k, $v) use ($parent, $foreign)
+			$matching = array_first($children, function($k, $v) use (&$parent, $foreign)
 			{
 				return $v->$foreign == $parent->get_key();
 			});

laravel/documentation/changes.md

@@ -2,6 +2,8 @@ # Laravel Change Log
 
 ## Contents
 
+- [Laravel 3.2.3](#3.2.3)
+- [Upgrading From 3.2.2](#upgrade-3.2.3)
 - [Laravel 3.2.2](#3.2.2)
 - [Upgrading From 3.2.1](#upgrade-3.2.2)
 - [Laravel 3.2.1](#3.2.1)
@@ -29,6 +31,17 @@ ## Contents
 - [Laravel 3.1](#3.1)
 - [Upgrading From 3.0](#upgrade-3.1)
 
+<a name="3.2.3"></a>
+## Laravel 3.2.3
+
+- Fixed eager loading bug in Eloquent.
+- Added `laravel.resolving` event for all IoC resolutions.
+
+<a name="upgrade-3.2.3"></a>
+## Upgrading From 3.2.2
+
+- Replace the **laravel** folder.
+
 <a name="3.2.2"></a>
 ## Laravel 3.2.2
 

laravel/ioc.php

@@ -129,6 +129,8 @@ public static function resolve($type, $parameters = array())
 			static::$singletons[$type] = $object;
 		}
 
+		Event::fire('laravel.resolving', array($type, $object));
+
 		return $object;
 	}
 

paths.php

@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.2.2
+ * @version  3.2.3
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */

public/index.php

@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.2.2
+ * @version  3.2.3
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */