From 88908ade02292d4279c67263ddd7e685509838d7 Mon Sep 17 00:00:00 2001 From: Joachim Kudish Date: Thu, 10 May 2012 10:03:54 -0700 Subject: [PATCH 01/13] moose are uncountable --- application/config/strings.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/config/strings.php b/application/config/strings.php index 730f973e..5d94f81c 100644 --- a/application/config/strings.php +++ b/application/config/strings.php @@ -95,6 +95,7 @@ return array( 'series', 'sheep', 'species', + 'moose', ), /* From bf172272da78d9ef0ff3b6712c3ab7fe57df7c74 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 11 May 2012 12:20:18 +0300 Subject: [PATCH 02/13] Remove obsolete code. --- laravel/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/lang.php b/laravel/lang.php index 5c5e9f76..e4a09e1c 100644 --- a/laravel/lang.php +++ b/laravel/lang.php @@ -1,4 +1,4 @@ - Date: Fri, 11 May 2012 12:21:43 +0300 Subject: [PATCH 03/13] Remove obsolete namespace import in driver.php. --- laravel/cache/drivers/driver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/cache/drivers/driver.php b/laravel/cache/drivers/driver.php index b4701eb8..c6abcb2e 100644 --- a/laravel/cache/drivers/driver.php +++ b/laravel/cache/drivers/driver.php @@ -1,4 +1,4 @@ - Date: Fri, 11 May 2012 12:23:25 +0300 Subject: [PATCH 04/13] Fix PHPDoc referring to Closure class. --- laravel/database/connection.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/laravel/database/connection.php b/laravel/database/connection.php index 6584942d..dd1d8de6 100644 --- a/laravel/database/connection.php +++ b/laravel/database/connection.php @@ -97,14 +97,14 @@ class Connection { /** * Execute a callback wrapped in a database transaction. * - * @param Closure $callback + * @param callback $callback * @return void */ public function transaction($callback) { $this->pdo->beginTransaction(); - // After beginning the database transaction, we will call the Closure + // After beginning the database transaction, we will call the callback // so that it can do its database work. If an exception occurs we'll // rollback the transaction and re-throw back to the developer. try From 83f7847ccd0cacdfec41a2dc6287ee233ceb0de1 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 11 May 2012 12:27:38 +0300 Subject: [PATCH 05/13] Remove obsolete namespace import in session/payload.php. --- laravel/session/payload.php | 1 - 1 file changed, 1 deletion(-) diff --git a/laravel/session/payload.php b/laravel/session/payload.php index 3c236c7c..5b45a533 100644 --- a/laravel/session/payload.php +++ b/laravel/session/payload.php @@ -1,6 +1,5 @@ Date: Fri, 11 May 2012 12:28:12 +0300 Subject: [PATCH 06/13] Remove obsolete namespace import in config.php. --- laravel/config.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/laravel/config.php b/laravel/config.php index a26e05a9..50bd7dc8 100644 --- a/laravel/config.php +++ b/laravel/config.php @@ -1,7 +1,5 @@ Date: Fri, 11 May 2012 12:28:52 +0300 Subject: [PATCH 07/13] Remove obsolete class import in cookie.php. --- laravel/cookie.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/cookie.php b/laravel/cookie.php index 78c13a6d..88967407 100644 --- a/laravel/cookie.php +++ b/laravel/cookie.php @@ -1,4 +1,4 @@ - Date: Fri, 11 May 2012 12:29:18 +0300 Subject: [PATCH 08/13] Remove obsolete class import in file.php. --- laravel/file.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/file.php b/laravel/file.php index e5bf8f5a..efb46dec 100644 --- a/laravel/file.php +++ b/laravel/file.php @@ -1,4 +1,4 @@ - Date: Fri, 11 May 2012 12:30:45 +0300 Subject: [PATCH 09/13] Remove obsolete class import in request.php. --- laravel/request.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/request.php b/laravel/request.php index 37f408ec..028670f1 100644 --- a/laravel/request.php +++ b/laravel/request.php @@ -1,4 +1,4 @@ - Date: Fri, 11 May 2012 13:11:02 -0600 Subject: [PATCH 10/13] where_nested no longer breaks on closures that don't actually set anything --- laravel/database/query.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/laravel/database/query.php b/laravel/database/query.php index 29370931..607a8627 100644 --- a/laravel/database/query.php +++ b/laravel/database/query.php @@ -414,7 +414,10 @@ class Query { // Once the callback has been run on the query, we will store the nested // query instance on the where clause array so that it's passed to the // query's query grammar instance when building. - $this->wheres[] = compact('type', 'query', 'connector'); + if ($query->wheres !== null) + { + $this->wheres[] = compact('type', 'query', 'connector'); + } $this->bindings = array_merge($this->bindings, $query->bindings); From 11b9f522398efd0b95de805082736471a0992f3c Mon Sep 17 00:00:00 2001 From: Erik Dubbelboer Date: Sat, 12 May 2012 18:28:45 +0200 Subject: [PATCH 11/13] fix error in comment Signed-off-by: Erik Dubbelboer --- laravel/lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/laravel/lang.php b/laravel/lang.php index e4a09e1c..8fd5f7ba 100644 --- a/laravel/lang.php +++ b/laravel/lang.php @@ -103,7 +103,7 @@ class Lang { * $line = Lang::line('validation.required')->get('sp'); * * // Return a default value if the line doesn't exist - * $line = Lang::line('validation.required', null, 'Default'); + * $line = Lang::line('validation.required')->get(null, 'Default'); * * * @param string $language @@ -249,4 +249,4 @@ class Lang { return (string) $this->get(); } -} \ No newline at end of file +} From 70b64f1928589f525fdb4ee1be64cb2cfd596978 Mon Sep 17 00:00:00 2001 From: Dayle Rees Date: Mon, 14 May 2012 14:11:56 +0200 Subject: [PATCH 12/13] forgot to add blade::extend() to this --- laravel/documentation/changes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/laravel/documentation/changes.md b/laravel/documentation/changes.md index f74f7801..ae90e185 100644 --- a/laravel/documentation/changes.md +++ b/laravel/documentation/changes.md @@ -35,6 +35,7 @@ - [Added `unless` structure to Blade template engine](/docs/views/templating#blade-unless). - [Added Blade comments](/docs/views/templating#blade-comments). - [Added simpler environment management](/docs/install#environments). +- Added `Blade::extend()` method to define custom blade compilers. - Added `View::exists` method. - Use [Memcached](http://php.net/manual/en/book.memcached.php) API instead of older [Memcache](http://php.net/manual/en/book.memcache.php) API. - Added support for bundles outside of the bundle directory. From 4ea27c9daf6922200aea1f8d11f0fe46a97519d8 Mon Sep 17 00:00:00 2001 From: Loic Sharma Date: Thu, 17 May 2012 23:03:42 -0500 Subject: [PATCH 13/13] Fixed minor spelling mistakes --- laravel/database/eloquent/query.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/laravel/database/eloquent/query.php b/laravel/database/eloquent/query.php index 71494a94..3aee79c9 100644 --- a/laravel/database/eloquent/query.php +++ b/laravel/database/eloquent/query.php @@ -129,9 +129,9 @@ class Query { { foreach ($this->model_includes() as $relationship => $constraints) { - // If the relationship is nested, we will skip laoding it here and let + // If the relationship is nested, we will skip loading it here and let // the load method parse and set the nested eager loads on the right - // relationship when it is getting ready to eager laod. + // relationship when it is getting ready to eager load. if (str_contains($relationship, '.')) { continue;