1
0
mirror of https://github.com/flarum/core.git synced 2025-10-12 15:34:26 +02:00

Applied fixes from StyleCI

This commit is contained in:
Toby Zerner
2016-02-25 22:09:39 -05:00
committed by StyleCI Bot
parent 83c22d73a4
commit a6cf10f854
96 changed files with 240 additions and 245 deletions

View File

@@ -60,7 +60,7 @@ class Client
if (! ($controller instanceof ControllerInterface)) {
throw new InvalidArgumentException('Endpoint must be an instance of '
. ControllerInterface::class);
.ControllerInterface::class);
}
try {

View File

@@ -87,7 +87,7 @@ class ListPostsController extends AbstractCollectionController
if (($near = array_get($queryParams, 'page.near')) > 1) {
if (count($filter) > 1 || ! isset($filter['discussion']) || $sort) {
throw new InvalidParameterException('You can only use page[near] with '
. 'filter[discussion] and the default sort order');
.'filter[discussion] and the default sort order');
}
$offset = $this->posts->getIndexForNumber($filter['discussion'], $near, $actor);

View File

@@ -25,12 +25,12 @@ class ShowDiscussionController extends AbstractResourceController
protected $discussions;
/**
* @inheritdoc
* {@inheritdoc}
*/
public $serializer = 'Flarum\Api\Serializer\DiscussionSerializer';
/**
* @inheritdoc
* {@inheritdoc}
*/
public $include = [
'posts',
@@ -42,7 +42,7 @@ class ShowDiscussionController extends AbstractResourceController
];
/**
* @inheritdoc
* {@inheritdoc}
*/
public $optionalInclude = [
'startUser',

View File

@@ -68,9 +68,9 @@ class TokenController implements ControllerInterface
$token = AccessToken::generate($user->id, $lifetime);
$token->save();
return (new JsonResponse([
return new JsonResponse([
'token' => $token->id,
'userId' => $user->id
]));
]);
}
}

View File

@@ -12,8 +12,6 @@ namespace Flarum\Api\Serializer;
use Closure;
use DateTime;
use Flarum\Api\Relationship\HasManyBuilder;
use Flarum\Api\Relationship\HasOneBuilder;
use Flarum\Core\User;
use Flarum\Event\GetApiRelationship;
use Flarum\Event\PrepareApiAttributes;
@@ -24,7 +22,6 @@ use LogicException;
use Tobscure\JsonApi\AbstractSerializer as BaseAbstractSerializer;
use Tobscure\JsonApi\Collection;
use Tobscure\JsonApi\Relationship;
use Tobscure\JsonApi\Relationship\BuilderInterface;
use Tobscure\JsonApi\Resource;
use Tobscure\JsonApi\SerializerInterface;
@@ -125,7 +122,7 @@ abstract class AbstractSerializer extends BaseAbstractSerializer
if ($relationship && ! ($relationship instanceof Relationship)) {
throw new LogicException('GetApiRelationship handler must return an instance of '
. Relationship::class);
.Relationship::class);
}
return $relationship;

View File

@@ -30,7 +30,7 @@ class DiscussionBasicSerializer extends AbstractSerializer
{
if (! ($discussion instanceof Discussion)) {
throw new InvalidArgumentException(get_class($this)
. ' can only serialize instances of ' . Discussion::class);
.' can only serialize instances of '.Discussion::class);
}
return [

View File

@@ -44,7 +44,7 @@ class GroupSerializer extends AbstractSerializer
{
if (! ($group instanceof Group)) {
throw new InvalidArgumentException(get_class($this)
. ' can only serialize instances of ' . Group::class);
.' can only serialize instances of '.Group::class);
}
return [

View File

@@ -38,7 +38,7 @@ class NotificationSerializer extends AbstractSerializer
{
if (! ($notification instanceof Notification)) {
throw new InvalidArgumentException(get_class($this)
. ' can only serialize instances of ' . Notification::class);
.' can only serialize instances of '.Notification::class);
}
return [

View File

@@ -31,7 +31,7 @@ class PostBasicSerializer extends AbstractSerializer
{
if (! ($post instanceof Post)) {
throw new InvalidArgumentException(get_class($this)
. ' can only serialize instances of ' . Post::class);
.' can only serialize instances of '.Post::class);
}
$attributes = [

View File

@@ -30,7 +30,7 @@ class UserBasicSerializer extends AbstractSerializer
{
if (! ($user instanceof User)) {
throw new InvalidArgumentException(get_class($this)
. ' can only serialize instances of ' . User::class);
.' can only serialize instances of '.User::class);
}
return [