From 921e232d9dec0e2bf35395f96d5e8a346b25d660 Mon Sep 17 00:00:00 2001 From: Austin White Date: Fri, 26 Oct 2012 16:59:33 -0700 Subject: [PATCH 1/3] Typo corrections --- laravel/documentation/auth/usage.md | 2 +- laravel/documentation/routing.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/laravel/documentation/auth/usage.md b/laravel/documentation/auth/usage.md index 4e7ba5fe..915c1671 100644 --- a/laravel/documentation/auth/usage.md +++ b/laravel/documentation/auth/usage.md @@ -16,7 +16,7 @@ ## Salting & Hashing If you are using the Auth class, you are strongly encouraged to hash and salt all passwords. Web development must be done responsibly. Salted, hashed passwords make a rainbow table attack against your user's passwords impractical. -Salting and hashing passwords is done using the **Hash** class. The Hash class is uses the **bcrypt** hashing algorithm. Check out this example: +Salting and hashing passwords is done using the **Hash** class. The Hash class uses the **bcrypt** hashing algorithm. Check out this example: $password = Hash::make('secret'); diff --git a/laravel/documentation/routing.md b/laravel/documentation/routing.md index 38ad8075..77ea7355 100644 --- a/laravel/documentation/routing.md +++ b/laravel/documentation/routing.md @@ -332,7 +332,7 @@ #### Registering a named route that points to a controller action: ## CLI Route Testing -You may test your routes using Laravel's "Artisan" CLI. Simple specify the request method and URI you want to use. The route response will be var_dump'd back to the CLI. +You may test your routes using Laravel's "Artisan" CLI. Simply specify the request method and URI you want to use. The route response will be var_dump'd back to the CLI. #### Calling a route via the Artisan CLI: From 6f30ed7a79e2e8eb2dc083c1b7a4aa81663fbdde Mon Sep 17 00:00:00 2001 From: Austin White Date: Wed, 31 Oct 2012 14:43:53 -0700 Subject: [PATCH 2/3] fixed issue #1206 --- laravel/validator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/validator.php b/laravel/validator.php index ab446860..5de7ac01 100644 --- a/laravel/validator.php +++ b/laravel/validator.php @@ -89,7 +89,7 @@ public function __construct($attributes, $rules, $messages = array()) $this->rules = $rules; $this->messages = $messages; - $this->attributes = $attributes; + $this->attributes = (is_object($attributes)) ? get_object_vars($attributes) : $attributes; } /** From aa37c826507427c8f79ff48583495e3775923469 Mon Sep 17 00:00:00 2001 From: Austin White Date: Wed, 31 Oct 2012 14:43:53 -0700 Subject: [PATCH 3/3] fixed issue #1206 --- laravel/validator.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/laravel/validator.php b/laravel/validator.php index ab446860..0fb209dc 100644 --- a/laravel/validator.php +++ b/laravel/validator.php @@ -75,7 +75,7 @@ class Validator { /** * Create a new validator instance. * - * @param array $attributes + * @param mixed $attributes * @param array $rules * @param array $messages * @return void @@ -89,7 +89,7 @@ public function __construct($attributes, $rules, $messages = array()) $this->rules = $rules; $this->messages = $messages; - $this->attributes = $attributes; + $this->attributes = (is_object($attributes)) ? get_object_vars($attributes) : $attributes; } /**