Merge branch 'master' into hassansin-master

taylorotwell · taylorotwell · commit 988d7ca20a07 · 2014-04-18T16:34:12.000-05:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -10,11 +10,11 @@ This page contains guidelines for contributing to the Laravel framework. Please
 
 The pull request process differs for new features and bugs. Before sending a pull request for a new feature, you should first create an issue with `[Proposal]` in the title. The proposal should describe the new feature, as well as implementation ideas. The proposal will then be reviewed and either approved or denied. Once a proposal is approved, a pull request may be created implementing the new feature. Pull requests which do not follow this guideline will be closed immediately.
 
-Pull requests for bugs may be sent without creating any proposal issue. If you believe that you know of a solution for a bug that has been filed on Github, please leave a comment detailing your proposed fix.
+Pull requests for bugs may be sent without creating any proposal issue. If you believe that you know of a solution for a bug that has been filed on GitHub, please leave a comment detailing your proposed fix.
 
 ### Feature Requests
 
-If you have an idea for a new feature you would like to see added to Laravel, you may create an issue on Github with `[Request]` in the title. The feature request will then be reviewed by a core contributor.
+If you have an idea for a new feature you would like to see added to Laravel, you may create an issue on GitHub with `[Request]` in the title. The feature request will then be reviewed by a core contributor.
 
 ## Coding Guidelines
 
diff --git a/src/Illuminate/Auth/Guard.php b/src/Illuminate/Auth/Guard.php
@@ -551,7 +551,7 @@ protected function refreshRememberToken(UserInterface $user)
 	}
 
 	/**
-	 * Create a new remember token for the user if one doens't already exist.
+	 * Create a new remember token for the user if one doesn't already exist.
 	 *
 	 * @param  \Illuminate\Auth\UserInterface  $user
 	 * @return void
diff --git a/src/Illuminate/Config/FileEnvironmentVariablesLoader.php b/src/Illuminate/Config/FileEnvironmentVariablesLoader.php
@@ -21,7 +21,7 @@ class FileEnvironmentVariablesLoader implements EnvironmentVariablesLoaderInterf
 	/**
 	 * Create a new file environment loader instance.
 	 *
-	 * @param  \Illumiante\Filesystem\Filesystem  $files
+	 * @param  \Illuminate\Filesystem\Filesystem  $files
 	 * @return void
 	 */
 	public function __construct(Filesystem $files, $path = null)
diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php
@@ -455,6 +455,11 @@ protected function getConcrete($abstract)
 		// since the container should be able to resolve concretes automatically.
 		if ( ! isset($this->bindings[$abstract]))
 		{
+			if ($this->missingLeadingSlash($abstract) && isset($this->bindings['\\'.$abstract]))
+			{
+				$abstract = '\\'.$abstract;
+			}
+
 			return $abstract;
 		}
 		else
@@ -463,6 +468,17 @@ protected function getConcrete($abstract)
 		}
 	}
 
+	/**
+	 * Determine if the given abstract has a leading slash.
+	 *
+	 * @param  string  $abstract
+	 * @return bool
+	 */
+	protected function missingLeadingSlash($abstract)
+	{
+		return is_string($abstract) && ! starts_with($abstract, '\\');
+	}
+
 	/**
 	 * Instantiate a concrete instance of the given type.
 	 *
diff --git a/src/Illuminate/Database/Connection.php b/src/Illuminate/Database/Connection.php
@@ -72,7 +72,7 @@ class Connection implements ConnectionInterface {
 	protected $fetchMode = PDO::FETCH_ASSOC;
 
 	/**
-	 * The number of active transasctions.
+	 * The number of active transactions.
 	 *
 	 * @var int
 	 */
diff --git a/src/Illuminate/Database/Connectors/SQLiteConnector.php b/src/Illuminate/Database/Connectors/SQLiteConnector.php
@@ -24,7 +24,7 @@ public function connect(array $config)
 
 		$path = realpath($config['database']);
 
-		// Here we'll verify that the SQLite database exists before we gooing further
+		// Here we'll verify that the SQLite database exists before going any further
 		// as the developer probably wants to know if the database exists and this
 		// SQLite driver will not throw any exception if it does not by default.
 		if ($path === false)
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -743,7 +743,7 @@ public function belongsTo($related, $foreignKey = null, $otherKey = null, $relat
 	{
 		// If no relation name was given, we will use this debug backtrace to extract
 		// the calling method's name and use that as the relationship name as most
-		// of the time this will be what we desire to use for the relatinoships.
+		// of the time this will be what we desire to use for the relationships.
 		if (is_null($relation))
 		{
 			list(, $caller) = debug_backtrace(false);
@@ -803,7 +803,7 @@ public function morphTo($name = null, $type = null, $id = null)
 			);
 		}
 
-		// If we are not eager loading the relatinship, we will essentially treat this
+		// If we are not eager loading the relationship we will essentially treat this
 		// as a belongs-to style relationship since morph-to extends that class and
 		// we will pass in the appropriate values so that it behaves as expected.
 		else
@@ -1313,7 +1313,7 @@ public function push()
 
 		// To sync all of the relationships to the database, we will simply spin through
 		// the relationships and save each model via this "push" method, which allows
-		// us to recurse into all of these nested relations for the model instance.
+		// us to recurs into all of these nested relations for this model instance.
 		foreach ($this->relations as $models)
 		{
 			foreach (Collection::make($models) as $model)
@@ -2606,7 +2606,12 @@ public function getDirty()
 
 		foreach ($this->attributes as $key => $value)
 		{
-			if ( ! array_key_exists($key, $this->original) || $value !== $this->original[$key])
+			if ( ! array_key_exists($key, $this->original))
+			{
+				$dirty[$key] = $value;
+			}
+			elseif ($value !== $this->original[$key] &&
+                                 ! $this->originalIsNumericallyEquivalent($key))
 			{
 				$dirty[$key] = $value;
 			}
@@ -2615,6 +2620,21 @@ public function getDirty()
 		return $dirty;
 	}
 
+	/**
+	 * Deteremine if the new and old values for a given key are numerically equivalent.
+	 *
+	 * @param  string  $key
+	 * @return bool
+	 */
+	protected function originalIsNumericallyEquivalent($key)
+	{
+		$current = $this->attributes[$key];
+
+		$original = $this->original[$key];
+
+		return is_numeric($current) && is_numeric($original) && strcmp((string) $current, (string) $original) === 0;
+	}
+
 	/**
 	 * Get all the loaded relations for the instance.
 	 *
diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php b/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
@@ -785,7 +785,7 @@ protected function createAttachRecord($id, $timed)
 	}
 
 	/**
-	 * Set the creation and update timstamps on an attach record.
+	 * Set the creation and update timestamps on an attach record.
 	 *
 	 * @param  array  $record
 	 * @param  bool   $exists
@@ -965,7 +965,7 @@ public function getRelatedFreshUpdate()
 	}
 
 	/**
-	 * Get the key for comparing against the pareny key in "has" query.
+	 * Get the key for comparing against the parent key in "has" query.
 	 *
 	 * @return string
 	 */
@@ -995,7 +995,7 @@ public function getOtherKey()
 	}
 
 	/**
-	 * Get the fully qualified parent key naem.
+	 * Get the fully qualified parent key name.
 	 *
 	 * @return string
 	 */
diff --git a/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php b/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
@@ -243,7 +243,7 @@ protected function getQualifiedParentKeyName()
 	}
 
 	/**
-	 * Get the key for comparing against the pareny key in "has" query.
+	 * Get the key for comparing against the parent key in "has" query.
 	 *
 	 * @return string
 	 */
diff --git a/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php b/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
@@ -236,7 +236,7 @@ public function update(array $attributes)
 	}
 
 	/**
-	 * Get the key for comparing against the pareny key in "has" query.
+	 * Get the key for comparing against the parent key in "has" query.
 	 *
 	 * @return string
 	 */
@@ -278,7 +278,7 @@ public function getParentKey()
 	}
 
 	/**
-	 * Get the fully qualified parent key naem.
+	 * Get the fully qualified parent key name.
 	 *
 	 * @return string
 	 */
diff --git a/src/Illuminate/Database/Eloquent/Relations/MorphTo.php b/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
@@ -58,7 +58,7 @@ public function addEagerConstraints(array $models)
 	}
 
 	/**
-	 * Buiild a dictionary with the models.
+	 * Build a dictionary with the models.
 	 *
 	 * @param  \Illuminate\Database\Eloquent\Models  $models
 	 * @return void
diff --git a/src/Illuminate/Database/Eloquent/Relations/Relation.php b/src/Illuminate/Database/Eloquent/Relations/Relation.php
@@ -209,7 +209,7 @@ public function getParent()
 	}
 
 	/**
-	 * Get the fully qualified parent key naem.
+	 * Get the fully qualified parent key name.
 	 *
 	 * @return string
 	 */
diff --git a/src/Illuminate/Database/Migrations/Migrator.php b/src/Illuminate/Database/Migrations/Migrator.php
@@ -72,7 +72,7 @@ public function run($path, $pretend = false)
 
 		// Once we grab all of the migration files for the path, we will compare them
 		// against the migrations that have already been run for this package then
-		// run all of the oustanding migrations against the database connection.
+		// run each of the outstanding migrations against a database connection.
 		$ran = $this->repository->getRan();
 
 		$migrations = array_diff($files, $ran);
diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php
@@ -1658,7 +1658,9 @@ public function max($column)
 	 */
 	public function sum($column)
 	{
-		return $this->aggregate(__FUNCTION__, array($column));
+		$result = $this->aggregate(__FUNCTION__, array($column));
+
+		return $result ?: 0;
 	}
 
 	/**
diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
@@ -418,7 +418,7 @@ protected function loadDeferredProvider($service)
 	}
 
 	/**
-	 * Register a deffered provider and service.
+	 * Register a deferred provider and service.
 	 *
 	 * @param  string  $provider
 	 * @param  string  $service
diff --git a/src/Illuminate/Foundation/EnvironmentDetector.php b/src/Illuminate/Foundation/EnvironmentDetector.php
@@ -76,7 +76,7 @@ protected function detectConsoleEnvironment($environments, array $args)
 	}
 
 	/**
-	 * Get the enviornment argument from the console.
+	 * Get the environment argument from the console.
 	 *
 	 * @param  array  $args
 	 * @return string|null
diff --git a/src/Illuminate/Foundation/changes.json b/src/Illuminate/Foundation/changes.json
@@ -125,7 +125,8 @@
 		{"message": "Added events for committing, rolling back, and starting transactions on databsae connections.", "backport": null},
 		{"message": "Added 'Auth::id' method to just get the authenticate user ID from the session / recaller cookie.", "backport": null},
 		{"message": "New 'Input::exists' function for checking for the mere presence of input items.", "backport": null},
-		{"message": "New system for invalidating remember me cookies on logout.", "backport": null}
+		{"message": "New system for invalidating remember me cookies on logout.", "backport": null},
+		{"message": "Iron queue now accepts ssl_verifypeer configuration option.", "backport": null}
 	],
 	"4.0.*": [
 		{"message": "Added implode method to query builder and Collection class.", "backport": null},
diff --git a/src/Illuminate/Http/Request.php b/src/Illuminate/Http/Request.php
@@ -177,29 +177,34 @@ public function exists($key)
 	}
 
 	/**
-	 * Determine if the request contains a non-emtpy value for an  input item.
+	 * Determine if the request contains a non-emtpy value for an input item.
 	 *
 	 * @param  string|array  $key
 	 * @return bool
 	 */
 	public function has($key)
 	{
-		if (count(func_get_args()) > 1)
-		{
-			foreach (func_get_args() as $value)
-			{
-				if ( ! $this->has($value)) return false;
-			}
-
-			return true;
-		}
+		$keys = is_array($key) ? $key : func_get_args();
 
-		if (is_bool($this->input($key)) || is_array($this->input($key)))
+		foreach ($keys as $value)
 		{
-			return true;
+			if ($this->isEmptyString($value)) return false;
 		}
 
-		return trim((string) $this->input($key)) !== '';
+		return true;
+	}
+
+	/**
+	 * Detremine if the given input key is an empty string for "has".
+	 *
+	 * @param  string  $key
+	 * @return bool
+	 */
+	protected function isEmptyString($key)
+	{
+		$boolOrArray = is_bool($this->input($key)) || is_array($this->input($key));
+
+		return ! $boolOrArray && trim((string) $this->input($key)) === '';
 	}
 
 	/**
diff --git a/src/Illuminate/Queue/Connectors/IronConnector.php b/src/Illuminate/Queue/Connectors/IronConnector.php
@@ -46,7 +46,14 @@ public function connect(array $config)
 
 		if (isset($config['host'])) $ironConfig['host'] = $config['host'];
 
-		return new IronQueue(new IronMQ($ironConfig), $this->crypt, $this->request, $config['queue'], $config['encrypt']);
+		$iron = new IronMQ($ironConfig);
+
+		if (isset($config['ssl_verifypeer']))
+		{
+			$iron->ssl_verifypeer = $config['ssl_verifypeer'];
+		}
+
+		return new IronQueue($iron, $this->crypt, $this->request, $config['queue'], $config['encrypt']);
 	}
 
 }
diff --git a/src/Illuminate/Remote/composer.json b/src/Illuminate/Remote/composer.json
@@ -13,7 +13,10 @@
         "phpseclib/phpseclib": "0.3.*"
     },
     "require-dev": {
-        "mockery/mockery": "0.8.0"
+        "illuminate/console": "4.1.*",
+        "illuminate/filesystem": "4.1.*",
+        "mockery/mockery": "0.9.*",
+        "phpunit/phpunit": "4.0.*"
     },
     "autoload": {
         "psr-0": {
diff --git a/src/Illuminate/Routing/Console/MakeControllerCommand.php b/src/Illuminate/Routing/Console/MakeControllerCommand.php
@@ -78,7 +78,7 @@ protected function generateController()
 
 		// Finally, we're ready to generate the actual controller file on disk and let
 		// the developer start using it. The controller will be stored in the right
-		// place based on the naemspace of this controller specified by commands.
+		// place based on the namespace of this controller specified by commands.
 		$this->generator->make($controller, $path, $options);
 
 		$this->info('Controller created successfully!');
diff --git a/src/Illuminate/Routing/ControllerDispatcher.php b/src/Illuminate/Routing/ControllerDispatcher.php
@@ -174,7 +174,7 @@ protected function filterApplies($filter, $request, $method)
 	}
 
 	/**
-	 * Determine if the filter fails the "only" cosntraint.
+	 * Determine if the filter fails the "only" constraint.
 	 *
 	 * @param  array  $filter
 	 * @param  \Illuminate\Http\Request  $request
@@ -189,7 +189,7 @@ protected function filterFailsOnly($filter, $request, $method)
 	}
 
 	/**
-	 * Determine if the filter fails the "except" cosntraint.
+	 * Determine if the filter fails the "except" constraint.
 	 *
 	 * @param  array  $filter
 	 * @param  \Illuminate\Http\Request  $request
@@ -204,7 +204,7 @@ protected function filterFailsExcept($filter, $request, $method)
 	}
 
 	/**
-	 * Determine if the filter fails the "on" cosntraint.
+	 * Determine if the filter fails the "on" constraint.
 	 *
 	 * @param  array  $filter
 	 * @param  \Illuminate\Http\Request  $request
diff --git a/src/Illuminate/Routing/Generators/ControllerGenerator.php b/src/Illuminate/Routing/Generators/ControllerGenerator.php
@@ -115,7 +115,7 @@ protected function getController($controller)
 	{
 		$stub = $this->files->get(__DIR__.'/stubs/controller.stub');
 
-		// We will explode out the controller name on the naemspace delimiter so we
+		// We will explode out the controller name on the namespace delimiter so we
 		// are able to replace a namespace in this stub file. If no namespace is
 		// provided we'll just clear out the namespace place-holder locations.
 		$segments = explode('\\', $controller);
diff --git a/src/Illuminate/Routing/Route.php b/src/Illuminate/Routing/Route.php
diff --git a/src/Illuminate/Routing/RouteCollection.php b/src/Illuminate/Routing/RouteCollection.php
diff --git a/src/Illuminate/Routing/Router.php b/src/Illuminate/Routing/Router.php
diff --git a/src/Illuminate/Routing/UrlGenerator.php b/src/Illuminate/Routing/UrlGenerator.php
diff --git a/src/Illuminate/Translation/Translator.php b/src/Illuminate/Translation/Translator.php
diff --git a/src/Illuminate/Workbench/PackageCreator.php b/src/Illuminate/Workbench/PackageCreator.php
diff --git a/tests/Container/ContainerTest.php b/tests/Container/ContainerTest.php
diff --git a/tests/Database/DatabaseEloquentModelTest.php b/tests/Database/DatabaseEloquentModelTest.php
diff --git a/tests/Routing/RoutingRouteTest.php b/tests/Routing/RoutingRouteTest.php

Original file line number	Diff line number	Diff line change
`@@ -551,7 +551,7 @@ protected function refreshRememberToken(UserInterface $user)`
`551`	`551`	`}`
`552`	`552`
`553`	`553`	`/**`
`554`		`- * Create a new remember token for the user if one doens't already exist.`
	`554`	`+ * Create a new remember token for the user if one doesn't already exist.`
`555`	`555`	`*`
`556`	`556`	`* @param \Illuminate\Auth\UserInterface $user`
`557`	`557`	`* @return void`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class FileEnvironmentVariablesLoader implements EnvironmentVariablesLoaderInterf`
`21`	`21`	`/**`
`22`	`22`	`* Create a new file environment loader instance.`
`23`	`23`	`*`
`24`		`- * @param \Illumiante\Filesystem\Filesystem $files`
	`24`	`+ * @param \Illuminate\Filesystem\Filesystem $files`
`25`	`25`	`* @return void`
`26`	`26`	`*/`
`27`	`27`	`public function __construct(Filesystem $files, $path = null)`
Original file line number	Diff line number	Diff line change
`@@ -455,6 +455,11 @@ protected function getConcrete($abstract)`
`455`	`455`	`// since the container should be able to resolve concretes automatically.`
`456`	`456`	`if ( ! isset($this->bindings[$abstract]))`
`457`	`457`	`{`
	`458`	`+ if ($this->missingLeadingSlash($abstract) && isset($this->bindings['\\'.$abstract]))`
	`459`	`+ {`
	`460`	`+ $abstract = '\\'.$abstract;`
	`461`	`+ }`
	`462`	`+`
`458`	`463`	`return $abstract;`
`459`	`464`	`}`
`460`	`465`	`else`
`@@ -463,6 +468,17 @@ protected function getConcrete($abstract)`
`463`	`468`	`}`
`464`	`469`	`}`
`465`	`470`
	`471`	`+ /**`
	`472`	`+ * Determine if the given abstract has a leading slash.`
	`473`	`+ *`
	`474`	`+ * @param string $abstract`
	`475`	`+ * @return bool`
	`476`	`+ */`
	`477`	`+ protected function missingLeadingSlash($abstract)`
	`478`	`+ {`
	`479`	`+ return is_string($abstract) && ! starts_with($abstract, '\\');`
	`480`	`+ }`
	`481`	`+`
`466`	`482`	`/**`
`467`	`483`	`* Instantiate a concrete instance of the given type.`
`468`	`484`	`*`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class Connection implements ConnectionInterface {`
`72`	`72`	`protected $fetchMode = PDO::FETCH_ASSOC;`
`73`	`73`
`74`	`74`	`/**`
`75`		`- * The number of active transasctions.`
	`75`	`+ * The number of active transactions.`
`76`	`76`	`*`
`77`	`77`	`* @var int`
`78`	`78`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -785,7 +785,7 @@ protected function createAttachRecord($id, $timed)`
`785`	`785`	`}`
`786`	`786`
`787`	`787`	`/**`
`788`		`- * Set the creation and update timstamps on an attach record.`
	`788`	`+ * Set the creation and update timestamps on an attach record.`
`789`	`789`	`*`
`790`	`790`	`* @param array $record`
`791`	`791`	`* @param bool $exists`
`@@ -965,7 +965,7 @@ public function getRelatedFreshUpdate()`
`965`	`965`	`}`
`966`	`966`
`967`	`967`	`/**`
`968`		`- * Get the key for comparing against the pareny key in "has" query.`
	`968`	`+ * Get the key for comparing against the parent key in "has" query.`
`969`	`969`	`*`
`970`	`970`	`* @return string`
`971`	`971`	`*/`
`@@ -995,7 +995,7 @@ public function getOtherKey()`
`995`	`995`	`}`
`996`	`996`
`997`	`997`	`/**`
`998`		`- * Get the fully qualified parent key naem.`
	`998`	`+ * Get the fully qualified parent key name.`
`999`	`999`	`*`
`1000`	`1000`	`* @return string`
`1001`	`1001`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ protected function getQualifiedParentKeyName()`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`/**`
`246`		`- * Get the key for comparing against the pareny key in "has" query.`
	`246`	`+ * Get the key for comparing against the parent key in "has" query.`
`247`	`247`	`*`
`248`	`248`	`* @return string`
`249`	`249`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ public function update(array $attributes)`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`/**`
`239`		`- * Get the key for comparing against the pareny key in "has" query.`
	`239`	`+ * Get the key for comparing against the parent key in "has" query.`
`240`	`240`	`*`
`241`	`241`	`* @return string`
`242`	`242`	`*/`
`@@ -278,7 +278,7 @@ public function getParentKey()`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`/**`
`281`		`- * Get the fully qualified parent key naem.`
	`281`	`+ * Get the fully qualified parent key name.`
`282`	`282`	`*`
`283`	`283`	`* @return string`
`284`	`284`	`*/`