8000 Merge pull request #646 from barryvdh/patch/phpdocs · laravel/framework@166c63e · GitHub
[go: up one dir, main page]
Skip to content

Commit 166c63e

Browse files
taylorotwelltaylorotwell
committed
Merge pull request #646 from barryvdh/patch/phpdocs
Fix some namespace/parameters in phpdocs
2 parents daa0739 + 341d0f9 commit 166c63e

File tree

17 files changed

+353
-351
lines changed

17 files changed

+353
-351
lines changed

‎src/Illuminate/Auth/Reminders/PasswordBroker.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ class PasswordBroker {
4545
/**
4646
* Create a new password broker instance.
4747
*
48-
* @param Illuminate\Auth\ReminderRepositoryInterface $reminders
48+
* @param Illuminate\Auth\Reminders\ReminderRepositoryInterface $reminders
4949
* @param Illuminate\Auth\UserProviderInterface $users
50-
* @param Illuminate\Routing\Redirector $redirector
50+
* @param Illuminate\Routing\Redirector $redirect
5151
* @param Illuminate\Mail\Mailer $mailer
5252
* @param string $reminderView
5353
* @return void
@@ -97,7 +97,7 @@ public function remind(array $credentials, Closure $callback = null)
9797
/**
9898
* Send the password reminder e-mail.
9999
*
100-
* @param Illuminate\Auth\RemindableInterface $user
100+
* @param Illuminate\Auth\Reminders\RemindableInterface $user
101101
* @param string $token
102102
* @param Closure $callback
103103
* @return void

‎src/Illuminate/Cookie/CookieJar.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public function getRequest()
147147
/**
148148
* Get the encrypter instance.
149149
*
150-
* @return Illuminate\Encrypter
150+
* @return Illuminate\Encryption\Encrypter
151151
*/
152152
public function getEncrypter()
153153
{

‎src/Illuminate/Database/Connection.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,7 @@ protected function handleQueryException(\Exception $e, $query, $bindings)
488488
*
489489
* @param string $query
490490
* @param array $bindings
491+
* @param $time
491492
* @return void
492493
*/
493494
public function logQuery($query, $bindings, $time = null)

‎src/Illuminate/Database/Eloquent/Model.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ public static function with($relations)
356356
*
357357
* @param string $related
358358
* @param string $foreignKey
359-
* @return Illuminate\Database\Eloquent\Relation\HasOne
359+
* @return Illuminate\Database\Eloquent\Relations\HasOne
360360
*/
361361
public function hasOne($related, $foreignKey = null)
362362
{
@@ -374,7 +374,7 @@ public function hasOne($related, $foreignKey = null)
374374
* @param string $name
375375
* @param string $type
376376
* @param string $id
377-
* @return Illuminate\Database\Eloquent\Relation\MorphOne
377+
* @return Illuminate\Database\Eloquent\Relations\MorphOne
378378
*/
379379
public function morphOne($related, $name, $type = null, $id = null)
380380
{
@@ -467,7 +467,7 @@ public function hasMany($related, $foreignKey = null)
467467
* @param string $name
468468
* @param string $type
469469
* @param string $id
470-
* @return Illuminate\Database\Eloquent\Relation\MorphMany
470+
* @return Illuminate\Database\Eloquent\Relations\MorphMany
471471
*/
472472
public function morphMany($related, $name, $type = null, $id = null)
473473
{

‎src/Illuminate/Encryption/Encrypter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ protected function padAndMcrypt($value, $iv)
8282
/**
8383
* Decrypt the given value.
8484
*
85-
* @param string $value
85+
* @param string $payload
8686
* @return string
8787
*/
8888
public function decrypt($payload)

0 commit comments

Comments
 (0)
0