Skip to content

Commit

Permalink
Remove pointless JSON-API action base class
Browse files Browse the repository at this point in the history
Cleanup related to #118.
  • Loading branch information
franzliedke committed Sep 9, 2015
1 parent 502a378 commit 902d017
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 49 deletions.
4 changes: 2 additions & 2 deletions src/Api/Actions/DeleteAction.php
Expand Up @@ -13,7 +13,7 @@
use Flarum\Api\Request;
use Zend\Diactoros\Response\EmptyResponse;

abstract class DeleteAction extends JsonApiAction
abstract class DeleteAction implements Action
{
/**
* Delegate deletion of the resource, and return a 204 No Content
Expand All @@ -22,7 +22,7 @@ abstract class DeleteAction extends JsonApiAction
* @param \Flarum\Api\Request $request
* @return \Psr\Http\Message\ResponseInterface
*/
public function respond(Request $request)
public function handle(Request $request)
{
$this->delete($request);

Expand Down
6 changes: 3 additions & 3 deletions src/Api/Actions/Extensions/UpdateAction.php
Expand Up @@ -10,13 +10,13 @@

namespace Flarum\Api\Actions\Extensions;

use Flarum\Api\Actions\JsonApiAction;
use Flarum\Api\Actions\Action;
use Flarum\Api\Request;
use Illuminate\Contracts\Bus\Dispatcher;
use Flarum\Core\Exceptions\PermissionDeniedException;
use Flarum\Support\ExtensionManager;

class UpdateAction extends JsonApiAction
class UpdateAction implements Action
{
protected $extensions;

Expand All @@ -25,7 +25,7 @@ public function __construct(ExtensionManager $extensions)
$this->extensions = $extensions;
}

protected function respond(Request $request)
public function handle(Request $request)
{
if (! $request->actor->isAdmin()) {
throw new PermissionDeniedException;
Expand Down
4 changes: 2 additions & 2 deletions src/Api/Actions/ForgotAction.php
Expand Up @@ -16,7 +16,7 @@
use Illuminate\Contracts\Bus\Dispatcher;
use Zend\Diactoros\Response\EmptyResponse;

class ForgotAction extends JsonApiAction
class ForgotAction implements Action
{
protected $users;

Expand All @@ -34,7 +34,7 @@ public function __construct(UserRepository $users, Dispatcher $bus)
* @param \Flarum\Api\Request $request
* @return \Psr\Http\Message\ResponseInterface
*/
public function respond(Request $request)
public function handle(Request $request)
{
$email = $request->get('email');

Expand Down
37 changes: 0 additions & 37 deletions src/Api/Actions/JsonApiAction.php

This file was deleted.

4 changes: 2 additions & 2 deletions src/Api/Actions/SerializeAction.php
Expand Up @@ -19,7 +19,7 @@
use Tobscure\JsonApi\SerializerInterface;
use Zend\Diactoros\Response\JsonResponse;

abstract class SerializeAction extends JsonApiAction
abstract class SerializeAction implements Action
{
/**
* The name of the serializer class to output results with.
Expand Down Expand Up @@ -77,7 +77,7 @@ abstract class SerializeAction extends JsonApiAction
* @param Request $request
* @return JsonResponse
*/
public function respond(Request $request)
public function handle(Request $request)
{
$request = $this->buildJsonApiRequest($request);
$document = new Document();
Expand Down
4 changes: 2 additions & 2 deletions src/Api/Actions/TokenAction.php
Expand Up @@ -18,7 +18,7 @@
use Illuminate\Contracts\Bus\Dispatcher;
use Zend\Diactoros\Response\JsonResponse;

class TokenAction extends JsonApiAction
class TokenAction implements Action
{
protected $users;

Expand All @@ -37,7 +37,7 @@ public function __construct(UserRepository $users, Dispatcher $bus)
* @return \Psr\Http\Message\ResponseInterface
* @throws PermissionDeniedException
*/
public function respond(Request $request)
public function handle(Request $request)
{
$identification = $request->get('identification');
$password = $request->get('password');
Expand Down
2 changes: 1 addition & 1 deletion src/Api/Client.php
Expand Up @@ -38,7 +38,7 @@ public function __construct(Container $container)
*/
public function send(User $actor, $actionClass, array $input = [])
{
/** @var \Flarum\Api\Actions\JsonApiAction $action */
/** @var \Flarum\Api\Actions\Action $action */
$action = $this->container->make($actionClass);

$response = $action->handle(new Request($input, $actor));
Expand Down

0 comments on commit 902d017

Please sign in to comment.