From 0a24189b0efee404d0a494252b5cf5ea63b29b68 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 13 Jun 2012 10:25:14 -0500 Subject: [PATCH 1/4] added resolving event. --- laravel/ioc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/laravel/ioc.php b/laravel/ioc.php index 512cf863..11292925 100644 --- a/laravel/ioc.php +++ b/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; } From b27b1321281bf86212d30a972efff43b988f17b9 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 13 Jun 2012 10:26:42 -0500 Subject: [PATCH 2/4] update change log --- artisan | 2 +- laravel/documentation/changes.md | 12 ++++++++++++ paths.php | 2 +- public/index.php | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/artisan b/artisan index 1864274b..ef7b4efb 100644 --- a/artisan +++ b/artisan @@ -4,7 +4,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.2.2 + * @version 3.3.0 * @author Taylor Otwell * @link http://laravel.com */ diff --git a/laravel/documentation/changes.md b/laravel/documentation/changes.md index d80e00dc..d994b7d6 100644 --- a/laravel/documentation/changes.md +++ b/laravel/documentation/changes.md @@ -2,6 +2,8 @@ # Laravel Change Log ## Contents +- [Laravel 3.3](#3.3) +- [Upgrading From 3.2](#upgrade-3.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,16 @@ ## Contents - [Laravel 3.1](#3.1) - [Upgrading From 3.0](#upgrade-3.1) + +## Laravel 3.3 + +- Added `laravel.resolving` event for all IoC resolutions. + + +## Upgrading From 3.2 + +- Replace the **laravel** folder. + ## Laravel 3.2.2 diff --git a/paths.php b/paths.php index 2a38aff0..29aac567 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.3.0 * @author Taylor Otwell * @link http://laravel.com */ diff --git a/public/index.php b/public/index.php index 74d9d4f9..18f0ed78 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.3.0 * @author Taylor Otwell * @link http://laravel.com */ From aeeb010e0a9d9f8cd3164be255cc2e72513327c5 Mon Sep 17 00:00:00 2001 From: Koen Schmeets Date: Sat, 16 Jun 2012 17:52:07 +0200 Subject: [PATCH 3/4] Fixing reference issue in relationship matching --- laravel/database/eloquent/relationships/belongs_to.php | 2 +- laravel/database/eloquent/relationships/has_many.php | 2 +- .../database/eloquent/relationships/has_many_and_belongs_to.php | 2 +- laravel/database/eloquent/relationships/has_one.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 @@ 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; }); 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 @@ 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(); }); 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 587e504c..52276a5f 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 @@ 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(); }); 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 @@ 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(); }); From 681f80eafb678c219696f992c4578857ea1a53ac Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sat, 16 Jun 2012 15:08:03 -0500 Subject: [PATCH 4/4] update change log --- artisan | 2 +- laravel/documentation/changes.md | 13 +++++++------ paths.php | 2 +- public/index.php | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/artisan b/artisan index ef7b4efb..e5dfd7ef 100644 --- a/artisan +++ b/artisan @@ -4,7 +4,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.3.0 + * @version 3.2.3 * @author Taylor Otwell * @link http://laravel.com */ diff --git a/laravel/documentation/changes.md b/laravel/documentation/changes.md index d994b7d6..d4e12daa 100644 --- a/laravel/documentation/changes.md +++ b/laravel/documentation/changes.md @@ -2,8 +2,8 @@ # Laravel Change Log ## Contents -- [Laravel 3.3](#3.3) -- [Upgrading From 3.2](#upgrade-3.3) +- [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) @@ -31,13 +31,14 @@ ## Contents - [Laravel 3.1](#3.1) - [Upgrading From 3.0](#upgrade-3.1) - -## Laravel 3.3 + +## Laravel 3.2.3 +- Fixed eager loading bug in Eloquent. - Added `laravel.resolving` event for all IoC resolutions. - -## Upgrading From 3.2 + +## Upgrading From 3.2.2 - Replace the **laravel** folder. diff --git a/paths.php b/paths.php index 29aac567..3a6622ff 100644 --- a/paths.php +++ b/paths.php @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.3.0 + * @version 3.2.3 * @author Taylor Otwell * @link http://laravel.com */ diff --git a/public/index.php b/public/index.php index 18f0ed78..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.3.0 + * @version 3.2.3 * @author Taylor Otwell * @link http://laravel.com */