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.

framework/core/src/Admin/Actions/IndexAction.php

@@ -1,6 +1,6 @@
 <?php namespace Flarum\Admin\Actions;
 
-use Flarum\Web\Actions\Action;
+use Flarum\Support\Action;
 use Illuminate\Http\Request;
 use Session;
 use Auth;

framework/core/src/Admin/AdminServiceProvider.php

@@ -1,7 +1,7 @@
 <?php namespace Flarum\Admin;
 
 use Illuminate\Support\ServiceProvider;
-use Flarum\Web\AssetManager;
+use Flarum\Support\AssetManager;
 
 class AdminServiceProvider extends ServiceProvider
 {

framework/core/src/Admin/Middleware/LoginWithCookieAndCheckAdmin.php

@@ -1,6 +1,6 @@
 <?php namespace Flarum\Admin\Middleware;
 
-use Flarum\Core\Support\Actor;
+use Flarum\Support\Actor;
 use Flarum\Core\Models\AccessToken;
 use Closure;
 

framework/core/src/Api/Actions/Activity/IndexAction.php

@@ -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;

framework/core/src/Api/Actions/BaseAction.php

@@ -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;

framework/core/src/Api/Actions/Discussions/IndexAction.php

@@ -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;

framework/core/src/Api/Actions/Discussions/ShowAction.php

@@ -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;

framework/core/src/Api/Actions/Notifications/IndexAction.php

@@ -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;

framework/core/src/Api/Actions/Posts/IndexAction.php

@@ -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;

framework/core/src/Api/Actions/Posts/ShowAction.php

@@ -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;

framework/core/src/Api/Actions/Users/IndexAction.php

@@ -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;

framework/core/src/Api/Actions/Users/ShowAction.php

@@ -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;

framework/core/src/Api/ApiServiceProvider.php

@@ -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');
     }
 }

framework/core/src/Api/Middleware/LoginWithHeader.php

@@ -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

framework/core/src/Api/Serializers/BaseSerializer.php

@@ -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)

framework/core/src/Forum/Actions/BaseAction.php

@@ -0,0 +1,13 @@
+<?php namespace Flarum\Forum\Actions;
+
+use Flarum\Support\Action;
+use Flarum\Forum\Events\CommandWillBeDispatched;
+
+abstract class BaseAction extends Action
+{
+    protected function dispatch($command, $params = [])
+    {
+        event(new CommandWillBeDispatched($command, $params));
+        return $this->bus->dispatch($command);
+    }
+}

framework/core/src/Forum/Actions/ConfirmAction.php

@@ -1,11 +1,11 @@
-<?php namespace Flarum\Web\Actions;
+<?php namespace Flarum\Forum\Actions;
 
 use Illuminate\Http\Request;
 use Flarum\Core\Commands\ConfirmEmailCommand;
 use Flarum\Core\Commands\GenerateAccessTokenCommand;
 use Flarum\Core\Exceptions\InvalidConfirmationTokenException;
 
-class ConfirmAction extends Action
+class ConfirmAction extends BaseAction
 {
     use MakesRememberCookie;
 

framework/core/src/Forum/Actions/IndexAction.php

@@ -1,4 +1,4 @@
-<?php namespace Flarum\Web\Actions;
+<?php namespace Flarum\Forum\Actions;
 
 use Illuminate\Http\Request;
 use Session;
@@ -7,7 +7,7 @@ use Cookie;
 use Config;
 use View;
 
-class IndexAction extends Action
+class IndexAction extends BaseAction
 {
     public function handle(Request $request, $params = [])
     {
@@ -43,10 +43,10 @@ class IndexAction extends Action
 
 
 
-        return View::make('flarum.web::index')
+        return View::make('flarum.forum::index')
             ->with('title', Config::get('flarum::forum_title', 'Flarum Demo Forum'))
-            ->with('styles', app('flarum.web.assetManager')->getCSSFiles())
-            ->with('scripts', app('flarum.web.assetManager')->getJSFiles())
+            ->with('styles', app('flarum.forum.assetManager')->getCSSFiles())
+            ->with('scripts', app('flarum.forum.assetManager')->getJSFiles())
             ->with('config', $config)
             ->with('content', '')
             ->with('data', $data)

framework/core/src/Forum/Actions/LoginAction.php

@@ -1,10 +1,10 @@
-<?php namespace Flarum\Web\Actions;
+<?php namespace Flarum\Forum\Actions;
 
 use Illuminate\Http\Request;
-use Flarum\Web\Events\UserLoggedIn;
+use Flarum\Forum\Events\UserLoggedIn;
 use Flarum\Core\Repositories\UserRepositoryInterface;
 
-class LoginAction extends Action
+class LoginAction extends BaseAction
 {
     use MakesRememberCookie;
 

framework/core/src/Forum/Actions/LogoutAction.php

@@ -1,10 +1,10 @@
-<?php namespace Flarum\Web\Actions;
+<?php namespace Flarum\Forum\Actions;
 
 use Illuminate\Http\Request;
-use Flarum\Web\Events\UserLoggedOut;
+use Flarum\Forum\Events\UserLoggedOut;
 use Cookie;
 
-class LogoutAction extends Action
+class LogoutAction extends BaseAction
 {
     public function handle(Request $request, $params = [])
     {

framework/core/src/Forum/Actions/MakesRememberCookie.php

@@ -1,4 +1,4 @@
-<?php namespace Flarum\Web\Actions;
+<?php namespace Flarum\Forum\Actions;
 
 use Cookie;
 

framework/core/src/Forum/Events/CommandWillBeDispatched.php

@@ -1,4 +1,4 @@
-<?php namespace Flarum\Web\Events;
+<?php namespace Flarum\Forum\Events;
 
 class CommandWillBeDispatched
 {

framework/core/src/Forum/Events/UserLoggedIn.php

@@ -1,4 +1,4 @@
-<?php namespace Flarum\Web\Events;
+<?php namespace Flarum\Forum\Events;
 
 use Flarum\Core\Models\User;
 

framework/core/src/Forum/Events/UserLoggedOut.php

@@ -1,4 +1,4 @@
-<?php namespace Flarum\Web\Events;
+<?php namespace Flarum\Forum\Events;
 
 use Flarum\Core\Models\User;
 

framework/core/src/Forum/ForumServiceProvider.php

@@ -1,8 +1,9 @@
-<?php namespace Flarum\Web;
+<?php namespace Flarum\Forum;
 
 use Illuminate\Support\ServiceProvider;
+use Flarum\Support\AssetManager;
 
-class WebServiceProvider extends ServiceProvider
+class ForumServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap the application events.
@@ -13,9 +14,9 @@ class WebServiceProvider extends ServiceProvider
     {
         $root = __DIR__.'/../..';
 
-        $this->loadViewsFrom($root.'/views', 'flarum.web');
+        $this->loadViewsFrom($root.'/views', 'flarum.forum');
 
-        $assetManager = $this->app['flarum.web.assetManager'];
+        $assetManager = $this->app['flarum.forum.assetManager'];
 
         $assetManager->addFile([
             $root.'/ember/forum/dist/assets/vendor.js',
@@ -37,7 +38,7 @@ class WebServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app['flarum.web.assetManager'] = $this->app->share(function ($app) {
+        $this->app['flarum.forum.assetManager'] = $this->app->share(function ($app) {
             return new AssetManager($app['files'], $app['path.public'].'/flarum', 'forum');
         });
     }

framework/core/src/Forum/Middleware/LoginWithCookie.php

@@ -1,6 +1,6 @@
-<?php namespace Flarum\Web\Middleware;
+<?php namespace Flarum\Forum\Middleware;
 
-use Flarum\Core\Support\Actor;
+use Flarum\Support\Actor;
 use Flarum\Core\Models\AccessToken;
 use Auth;
 use Closure;

framework/core/src/Forum/routes.php

@@ -0,0 +1,34 @@
+<?php
+
+$action = function ($class) {
+    return function () use ($class) {
+        $action = $this->app->make($class);
+        $request = $this->app['request']->instance();
+        $parameters = $this->app['router']->current()->parameters();
+        return $action->handle($request, $parameters);
+    };
+};
+
+Route::group(['middleware' => 'Flarum\Forum\Middleware\LoginWithCookie'], function () use ($action) {
+
+    Route::get('/', [
+        'as' => 'flarum.forum.index',
+        'uses' => $action('Flarum\Forum\Actions\IndexAction')
+    ]);
+
+    Route::get('logout', [
+        'as' => 'flarum.forum.logout',
+        'uses' => $action('Flarum\Forum\Actions\LogoutAction')
+    ]);
+
+});
+
+Route::post('login', [
+    'as' => 'flarum.forum.login',
+    'uses' => $action('Flarum\Forum\Actions\LoginAction')
+]);
+
+Route::get('confirm/{id}/{token}', [
+    'as' => 'flarum.forum.confirm',
+    'uses' => $action('Flarum\Forum\Actions\ConfirmAction')
+]);

framework/core/src/Support/Action.php

@@ -1,9 +1,7 @@
-<?php namespace Flarum\Web\Actions;
+<?php namespace Flarum\Support;
 
 use Illuminate\Http\Request;
 use Illuminate\Contracts\Bus\Dispatcher;
-use Flarum\Web\Events\CommandWillBeDispatched;
-use Flarum\Core\Support\Actor;
 
 abstract class Action
 {
@@ -20,10 +18,4 @@ abstract class Action
         $action = app($class);
         return $action->call($params);
     }
-
-    protected function dispatch($command, $params = [])
-    {
-        event(new CommandWillBeDispatched($command, $params));
-        return $this->bus->dispatch($command);
-    }
 }

framework/core/src/Support/Actor.php

@@ -1,4 +1,4 @@
-<?php namespace Flarum\Core\Support;
+<?php namespace Flarum\Support;
 
 use Flarum\Core\Models\Guest;
 

framework/core/src/Support/AssetManager.php

@@ -1,4 +1,4 @@
-<?php namespace Flarum\Web;
+<?php namespace Flarum\Support;
 
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Str;

framework/core/src/Web/routes.php

@@ -1,34 +0,0 @@
-<?php
-
-$action = function ($class) {
-    return function () use ($class) {
-        $action = $this->app->make($class);
-        $request = $this->app['request']->instance();
-        $parameters = $this->app['router']->current()->parameters();
-        return $action->handle($request, $parameters);
-    };
-};
-
-Route::group(['middleware' => 'Flarum\Web\Middleware\LoginWithCookie'], function () use ($action) {
-
-    Route::get('/', [
-        'as' => 'flarum.index',
-        'uses' => $action('Flarum\Web\Actions\IndexAction')
-    ]);
-
-    Route::get('logout', [
-        'as' => 'flarum.logout',
-        'uses' => $action('Flarum\Web\Actions\LogoutAction')
-    ]);
-
-});
-
-Route::post('login', [
-    'as' => 'flarum.login',
-    'uses' => $action('Flarum\Web\Actions\LoginAction')
-]);
-
-Route::get('confirm/{id}/{token}', [
-    'as' => 'flarum.confirm',
-    'uses' => $action('Flarum\Web\Actions\ConfirmAction')
-]);