8000 Fix some namespace/parameters in phpdocs by barryvdh · Pull Request #646 · laravel/framework · GitHub
[go: up one dir, main page]

Skip to content

Fix some namespace/parameters in phpdocs #646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 22, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Illuminate/Auth/Reminders/PasswordBroker.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ class PasswordBroker {
/**
* Create a new password broker instance.
*
* @param Illuminate\Auth\ReminderRepositoryInterface $reminders
* @param Illuminate\Auth\Reminders\ReminderRepositoryInterface $reminders
* @param Illuminate\Auth\UserProviderInterface $users
* @param Illuminate\Routing\Redirector $redirector
* @param Illuminate\Routing\Redirector $redirect
* @param Illuminate\Mail\Mailer $mailer
* @param string $reminderView
* @return void
Expand Down Expand Up @@ -97,7 +97,7 @@ public function remind(array $credentials, Closure $callback = null)
/**
* Send the password reminder e-mail.
*
* @param Illuminate\Auth\RemindableInterface $user
* @param Illuminate\Auth\Reminders\RemindableInterface $user
* @param string $token
* @param Closure $callback
* @return void
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Cookie/CookieJar.php
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public function getRequest()
/**
* Get the encrypter instance.
*
* @return Illuminate\Encrypter
* @return Illuminate\Encryption\Encrypter
*/
public function getEncrypter()
{
Expand Down
1 change: 1 addition & 0 deletions src/Illuminate/Database/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,7 @@ protected function handleQueryException(\Exception $e, $query, $bindings)
*
* @param string $query
* @param array $bindings
* @param $time
* @return void
*/
public function logQuery($query, $bindings, $time = null)
Expand Down
6 changes: 3 additions & 3 deletions src/Illuminate/Database/Eloquent/Model.php
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ public static function with($relations)
*
* @param string $related
* @param string $foreignKey
* @return Illuminate\Database\Eloquent\Relation\HasOne
* @return Illuminate\Database\Eloquent\Relations\HasOne
*/
public function hasOne($related, $foreignKey = null)
{
Expand All @@ -374,7 +374,7 @@ public function hasOne($related, $foreignKey = null)
* @param string $name
* @param string $type
* @param string $id
* @return Illuminate\Database\Eloquent\Relation\MorphOne
* @return Illuminate\Database\Eloquent\Relations\MorphOne
*/
public function morphOne($related, $name, $type = null, $id = null)
{
Expand Down Expand Up @@ -467,7 +467,7 @@ public function hasMany($related, $foreignKey = null)
* @param string $name
* @param string $type
* @param string $id
* @return Illuminate\Database\Eloquent\Relation\MorphMany
* @return Illuminate\Database\Eloquent\Relations\MorphMany
*/
public function morphMany($related, $name, $type = null, $id = null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Encryption/Encrypter.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ protected function padAndMcrypt($value, $iv)
/**
* Decrypt the given value.
*
* @param string $value
* @param string $payload
* @return string
*/
public function decrypt($payload)
Expand Down
Loading
0