ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chris Berthe
2012-06-18 12:38:59 -04:00
parent 8e5f1dd6f7 681f80eafb
commit 17e75a9719
9 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
artisan
View File

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

2
laravel/database/eloquent/relationships/belongs_to.php
View File

@@ -89,7 +89,7 @@ class Belongs_To extends Relationship {
foreach ($children as &$child) 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; return $v->get_key() == $child->$foreign;
}); });

2
laravel/database/eloquent/relationships/has_many.php
View File

@@ -93,7 +93,7 @@ class Has_Many extends Has_One_Or_Many {
foreach ($parents as &$parent) 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(); return $v->$foreign == $parent->get_key();
}); });

2
laravel/database/eloquent/relationships/has_many_and_belongs_to.php
View File

@@ -327,7 +327,7 @@ class Has_Many_And_Belongs_To extends Relationship {
foreach ($parents as &$parent) 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(); return $v->pivot->$foreign == $parent->get_key();
}); });

2
laravel/database/eloquent/relationships/has_one.php
View File

@@ -40,7 +40,7 @@ class Has_One extends Has_One_Or_Many {
foreach ($parents as &$parent) 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(); return $v->$foreign == $parent->get_key();
}); });

13
laravel/documentation/changes.md
View File

@@ -2,6 +2,8 @@
## Contents ## Contents
- [Laravel 3.2.3](#3.2.3)
- [Upgrading From 3.2.2](#upgrade-3.2.3)
- [Laravel 3.2.2](#3.2.2) - [Laravel 3.2.2](#3.2.2)
- [Upgrading From 3.2.1](#upgrade-3.2.2) - [Upgrading From 3.2.1](#upgrade-3.2.2)
- [Laravel 3.2.1](#3.2.1) - [Laravel 3.2.1](#3.2.1)
@@ -29,6 +31,17 @@
- [Laravel 3.1](#3.1) - [Laravel 3.1](#3.1)
- [Upgrading From 3.0](#upgrade-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> <a name="3.2.2"></a>
## Laravel 3.2.2 ## Laravel 3.2.2

2
laravel/ioc.php
View File

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

2
paths.php
View File

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

2
public/index.php
View File

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