diff --git a/artisan b/artisan index 1864274b..e5dfd7ef 100644 --- a/artisan +++ b/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 * @link http://laravel.com */ diff --git a/laravel/database/eloquent/relationships/belongs_to.php b/laravel/database/eloquent/relationships/belongs_to.php index 6ec8acdf..ef257836 100644 --- a/laravel/database/eloquent/relationships/belongs_to.php +++ b/laravel/database/eloquent/relationships/belongs_to.php @@ -89,7 +89,7 @@ class Belongs_To extends Relationship { 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; }); diff --git a/laravel/database/eloquent/relationships/has_many.php b/laravel/database/eloquent/relationships/has_many.php index 92a9e49b..726bef20 100644 --- a/laravel/database/eloquent/relationships/has_many.php +++ b/laravel/database/eloquent/relationships/has_many.php @@ -93,7 +93,7 @@ class Has_Many extends Has_One_Or_Many { 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(); }); diff --git a/laravel/database/eloquent/relationships/has_many_and_belongs_to.php b/laravel/database/eloquent/relationships/has_many_and_belongs_to.php index 5b247c9c..287165e1 100644 --- a/laravel/database/eloquent/relationships/has_many_and_belongs_to.php +++ b/laravel/database/eloquent/relationships/has_many_and_belongs_to.php @@ -327,7 +327,7 @@ class Has_Many_And_Belongs_To extends Relationship { 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(); }); diff --git a/laravel/database/eloquent/relationships/has_one.php b/laravel/database/eloquent/relationships/has_one.php index 7addabb0..8d1e4ff9 100644 --- a/laravel/database/eloquent/relationships/has_one.php +++ b/laravel/database/eloquent/relationships/has_one.php @@ -40,7 +40,7 @@ class Has_One extends Has_One_Or_Many { 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(); }); diff --git a/laravel/documentation/changes.md b/laravel/documentation/changes.md index d80e00dc..d4e12daa 100644 --- a/laravel/documentation/changes.md +++ b/laravel/documentation/changes.md @@ -2,6 +2,8 @@ ## 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 @@ - [Laravel 3.1](#3.1) - [Upgrading From 3.0](#upgrade-3.1) + +## Laravel 3.2.3 + +- Fixed eager loading bug in Eloquent. +- Added `laravel.resolving` event for all IoC resolutions. + + +## Upgrading From 3.2.2 + +- Replace the **laravel** folder. + ## Laravel 3.2.2 diff --git a/laravel/ioc.php b/laravel/ioc.php index 475932c5..969283a2 100644 --- a/laravel/ioc.php +++ b/laravel/ioc.php @@ -129,6 +129,8 @@ class IoC { static::$singletons[$type] = $object; } + Event::fire('laravel.resolving', array($type, $object)); + return $object; } diff --git a/paths.php b/paths.php index e3742042..4c4da2af 100644 --- a/paths.php +++ b/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 * @link http://laravel.com */ diff --git a/public/index.php b/public/index.php index 74d9d4f9..00cb86cd 100644 --- a/public/index.php +++ b/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 * @link http://laravel.com */