github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-13 07:03:35 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Update ForgotAction to comply with changes in base class

Browse Source
This commit is contained in:
Franz Liedke 2015-05-27 01:58:39 +02:00
parent a773970956
commit ee8e30910b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Api/Actions/JsonApiAction.php
View File

@ -35,7 +35,7 @@ abstract class JsonApiAction implements ActionInterface
}
}
protected function json($data, $status = 200)
protected function json($data = null, $status = 200)
{
if ($data === null) $data = new \ArrayObject();

5
framework/core/src/Api/Actions/Users/ForgotAction.php
View File

@ -4,7 +4,6 @@ use Flarum\Api\Request;
use Flarum\Api\Actions\JsonApiAction;
use Flarum\Core\Repositories\UserRepositoryInterface;
use Flarum\Core\Commands\RequestPasswordResetCommand;
use Illuminate\Http\Response;
use Illuminate\Contracts\Bus\Dispatcher;
class ForgotAction extends JsonApiAction
@ -23,7 +22,7 @@ class ForgotAction extends JsonApiAction
* Log in and return a token.
*
* @param \Flarum\Api\Request $request
* @return \Flarum\Api\Response
* @return \Psr\Http\Message\ResponseInterface
*/
public function respond(Request $request)
{
@ -33,6 +32,6 @@ class ForgotAction extends JsonApiAction
new RequestPasswordResetCommand($email)
);
return new Response;
return $this->json();
}
}