1
0
mirror of https://github.com/flarum/core.git synced 2025-10-18 10:16:09 +02:00

Refactor Flarum\Web and Flarum\Admin

- In order to be consistent with the Ember/LESS naming scheme, renamed
Flarum\Web to Flarum\Forum.
- Moved common classes into Flarum\Support so that Flarum\Admin doesn’t
depend on Flarum\Forum. Also moved Actor into Flarum\Support as it
doesn’t belong in the domain.
This commit is contained in:
Toby Zerner
2015-03-30 16:17:04 +10:30
parent fc4da97b80
commit 6898e0acbb
31 changed files with 94 additions and 88 deletions

View File

@@ -2,7 +2,7 @@
use Flarum\Core\Repositories\UserRepositoryInterface;
use Flarum\Core\Repositories\ActivityRepositoryInterface;
use Flarum\Core\Support\Actor;
use Flarum\Support\Actor;
use Flarum\Api\Actions\BaseAction;
use Flarum\Api\Actions\ApiParams;
use Flarum\Api\Serializers\ActivitySerializer;

View File

@@ -3,10 +3,10 @@
use Illuminate\Http\Request;
use Illuminate\Contracts\Bus\Dispatcher;
use Tobscure\JsonApi\Document;
use Flarum\Core\Support\Actor;
use Flarum\Support\Actor;
use Flarum\Api\Events\CommandWillBeDispatched;
use Flarum\Api\Events\WillRespondWithDocument;
use Flarum\Web\Actions\Action;
use Flarum\Support\Action;
use Config;
use App;
use Response;

View File

@@ -2,7 +2,7 @@
use Flarum\Core\Search\Discussions\DiscussionSearchCriteria;
use Flarum\Core\Search\Discussions\DiscussionSearcher;
use Flarum\Core\Support\Actor;
use Flarum\Support\Actor;
use Flarum\Api\Actions\BaseAction;
use Flarum\Api\Actions\ApiParams;
use Flarum\Api\Serializers\DiscussionSerializer;

View File

@@ -1,6 +1,6 @@
<?php namespace Flarum\Api\Actions\Discussions;
use Flarum\Core\Support\Actor;
use Flarum\Support\Actor;
use Flarum\Core\Repositories\DiscussionRepositoryInterface as DiscussionRepository;
use Flarum\Core\Repositories\PostRepositoryInterface as PostRepository;
use Flarum\Api\Actions\BaseAction;

View File

@@ -1,7 +1,7 @@
<?php namespace Flarum\Api\Actions\Notifications;
use Flarum\Core\Repositories\NotificationRepositoryInterface;
use Flarum\Core\Support\Actor;
use Flarum\Support\Actor;
use Flarum\Core\Exceptions\PermissionDeniedException;
use Flarum\Api\Actions\BaseAction;
use Flarum\Api\Actions\ApiParams;

View File

@@ -2,7 +2,7 @@
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Flarum\Core\Repositories\PostRepositoryInterface;
use Flarum\Core\Support\Actor;
use Flarum\Support\Actor;
use Flarum\Api\Actions\BaseAction;
use Flarum\Api\Actions\ApiParams;
use Flarum\Api\Serializers\PostSerializer;

View File

@@ -2,7 +2,7 @@
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Flarum\Core\Repositories\PostRepositoryInterface;
use Flarum\Core\Support\Actor;
use Flarum\Support\Actor;
use Flarum\Api\Actions\BaseAction;
use Flarum\Api\Actions\ApiParams;
use Flarum\Api\Serializers\PostSerializer;

View File

@@ -2,7 +2,7 @@
use Flarum\Core\Search\Users\UserSearchCriteria;
use Flarum\Core\Search\Users\UserSearcher;
use Flarum\Core\Support\Actor;
use Flarum\Support\Actor;
use Flarum\Api\Actions\BaseAction;
use Flarum\Api\Actions\ApiParams;
use Flarum\Api\Serializers\UserSerializer;

View File

@@ -1,7 +1,7 @@
<?php namespace Flarum\Api\Actions\Users;
use Flarum\Core\Repositories\UserRepositoryInterface;
use Flarum\Core\Support\Actor;
use Flarum\Support\Actor;
use Flarum\Api\Actions\ApiParams;
use Flarum\Api\Actions\BaseAction;
use Flarum\Api\Serializers\UserSerializer;

View File

@@ -19,7 +19,7 @@ class ApiServiceProvider extends ServiceProvider
include __DIR__.'/routes.php';
BaseSerializer::setActor($this->app['Flarum\Core\Support\Actor']);
BaseSerializer::setActor($this->app['Flarum\Support\Actor']);
}
/**
@@ -29,6 +29,6 @@ class ApiServiceProvider extends ServiceProvider
*/
public function register()
{
$this->app->singleton('Flarum\Core\Support\Actor');
$this->app->singleton('Flarum\Support\Actor');
}
}

View File

@@ -1,7 +1,7 @@
<?php namespace Flarum\Api\Middleware;
use Flarum\Core\Models\AccessToken;
use Flarum\Core\Support\Actor;
use Flarum\Support\Actor;
use Closure;
class LoginWithHeader

View File

@@ -3,7 +3,7 @@
use Tobscure\JsonApi\SerializerAbstract;
use Flarum\Api\Events\SerializeAttributes;
use Flarum\Api\Events\SerializeRelationship;
use Flarum\Core\Support\Actor;
use Flarum\Support\Actor;
use Closure;
/**
@@ -14,14 +14,14 @@ abstract class BaseSerializer extends SerializerAbstract
/**
* The actor who is requesting the serialized objects.
*
* @var \Flarum\Core\Support\Actor
* @var \Flarum\Support\Actor
*/
protected static $actor;
/**
* Set the actor who is requesting the serialized objects.
*
* @param \Flarum\Core\Support\Actor $actor
* @param \Flarum\Support\Actor $actor
* @return void
*/
public static function setActor(Actor $actor)