Merge branch 'develop' into staging

application/config/strings.php

@@ -95,6 +95,7 @@
 		'series',
 		'sheep',
 		'species',
+		'moose',
 	),
 
 	/*

laravel/cache/drivers/driver.php

@@ -1,4 +1,4 @@
-<?php namespace Laravel\Cache\Drivers; use Closure;
+<?php namespace Laravel\Cache\Drivers;
 
 abstract class Driver {
 

laravel/config.php

@@ -1,7 +1,5 @@
 <?php namespace Laravel; defined('DS') or die('No direct script access.');
 
-use Closure;
-
 class Config {
 
 	/**

laravel/cookie.php

@@ -1,4 +1,4 @@
-<?php namespace Laravel; use Closure;
+<?php namespace Laravel;
 
 class Cookie {
 

laravel/database/connection.php

@@ -97,14 +97,14 @@ protected function grammar()
 	/**
 	 * 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

laravel/database/eloquent/query.php

@@ -129,9 +129,9 @@ public function hydrate($model, $results)
 		{
 			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;

laravel/database/query.php

@@ -414,7 +414,10 @@ public function where_nested($callback, $connector = 'AND')
 		// 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);
 

laravel/documentation/changes.md

@@ -35,6 +35,7 @@ ## Laravel 3.2
 - [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.

laravel/file.php

@@ -1,4 +1,4 @@
-<?php namespace Laravel; use Closure, FilesystemIterator as fIterator;
+<?php namespace Laravel; use FilesystemIterator as fIterator;
 
 class File {
 

laravel/lang.php

@@ -1,4 +1,4 @@
-<?php namespace Laravel; use Closure;
+<?php namespace Laravel;
 
 class Lang {
 
@@ -103,7 +103,7 @@ public static function has($key, $language = null)
 	 *		$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');
 	 * </code>
 	 *
 	 * @param  string  $language
@@ -249,4 +249,4 @@ public function __toString()
 		return (string) $this->get();
 	}
 
-}
+}

laravel/request.php

@@ -1,4 +1,4 @@
-<?php namespace Laravel; use Closure;
+<?php namespace Laravel;
 
 class Request {
 

laravel/session/payload.php

@@ -1,6 +1,5 @@
 <?php namespace Laravel\Session;
 
-use Closure;
 use Laravel\Str;
 use Laravel\Config;
 use Laravel\Cookie;