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 @@ 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 @@ This routing convention may not be desirable for every situation, so you may als ## 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: diff --git a/laravel/validator.php b/laravel/validator.php index 68bbfe3a..8dbc5ca8 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 @@ class Validator { $this->rules = $rules; $this->messages = $messages; - $this->attributes = $attributes; + $this->attributes = (is_object($attributes)) ? get_object_vars($attributes) : $attributes; } /**