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

2012-06-18 12:38:59 -04:00
parent 8e5f1dd6f7 681f80eafb
commit 17e75a9719
9 changed files with 22 additions and 7 deletions
--- 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;
 	}