From d0afdf7bb291967e98b0c3c1ecb0d571567ba7ac Mon Sep 17 00:00:00 2001 From: Keith Loy Date: Fri, 1 Jun 2012 23:29:43 -0500 Subject: [PATCH 1/3] fixing bug where parameters are not passed in IoC::resolve() --- laravel/ioc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/ioc.php b/laravel/ioc.php index e752635a..512cf863 100644 --- a/laravel/ioc.php +++ b/laravel/ioc.php @@ -114,7 +114,7 @@ class IoC { // its nested dependencies recursively until they are each resolved. if ($concrete == $type or $concrete instanceof Closure) { - $object = static::build($concrete); + $object = static::build($concrete, $parameters); } else { From ea143fd9e166e60e89aa52294322117027ce542f Mon Sep 17 00:00:00 2001 From: hamuz Date: Sat, 2 Jun 2012 17:16:59 +0300 Subject: [PATCH 2/3] Use the static "compiled" method --- laravel/blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/blade.php b/laravel/blade.php index 416848f9..c362d57b 100644 --- a/laravel/blade.php +++ b/laravel/blade.php @@ -53,7 +53,7 @@ class Blade { return; } - $compiled = path('storage').'views/'.md5($view->path); + $compiled = Blade::compiled($view->path); // If the view doesn't exist or has been modified since the last time it // was compiled, we will recompile the view into pure PHP from it's From c8466f5766cc492e1362b49f09fc2659d1482fb1 Mon Sep 17 00:00:00 2001 From: AndrewBNZ Date: Sun, 3 Jun 2012 23:51:38 +1200 Subject: [PATCH 3/3] Fixed typo from previous fix, should be $command->columns not $command->$columns. --- laravel/database/schema/grammars/sqlserver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/database/schema/grammars/sqlserver.php b/laravel/database/schema/grammars/sqlserver.php index 6cc912f7..5f756c2e 100644 --- a/laravel/database/schema/grammars/sqlserver.php +++ b/laravel/database/schema/grammars/sqlserver.php @@ -138,7 +138,7 @@ class SQLServer extends Grammar { { $name = $command->name; - $columns = $this->columnize($command->$columns); + $columns = $this->columnize($command->columns); return 'ALTER TABLE '.$this->wrap($table)." ADD CONSTRAINT {$name} PRIMARY KEY ({$columns})"; }