mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-11 15:04:25 +02:00
Code Issues Releases Wiki Activity

Refactor the web app bootstrapping code

Browse Source 
- All custom JS variables are now preloaded into the `app.data` object, rather than directly on the `app` object. This means that admin settings are available in `app.data.settings` rather than `app.settings`, etc.
- Cleaner route handler generation
- Renamed ConfigureClientView to ConfigureWebApp, though the former still exists and is deprecated
- Partial fix for #881 (strips ?nojs=1 from URL if possible, so that refreshing will attempt to load JS version again)
This commit is contained in:
Toby Zerner
2016-05-26 19:04:24 +09:30
parent 2525e3e7ad
commit 9bfb797fdc
49 changed files with 1575 additions and 1254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Forum/Controller/DiscussionController.php
View File

@@ -10,18 +10,43 @@
namespace Flarum\Forum\Controller;
use Flarum\Api\Client as ApiClient;
use Flarum\Core\User;
use Flarum\Forum\WebApp;
use Flarum\Forum\UrlGenerator;
use Flarum\Http\Exception\RouteNotFoundException;
use Illuminate\Contracts\Events\Dispatcher;
use Psr\Http\Message\ServerRequestInterface as Request;
class DiscussionController extends ClientController
class DiscussionController extends WebAppController
{
/**
* @var ApiClient
*/
protected $api;
/**
* @var UrlGenerator
*/
protected $url;
/**
* {@inheritdoc}
*/
public function render(Request $request)
public function __construct(WebApp $webApp, Dispatcher $events, ApiClient $api, UrlGenerator $url)
{
$view = parent::render($request);
parent::__construct($webApp, $events);
$this->api = $api;
$this->url = $url;
}
/**
* {@inheritdoc}
*/
protected function getView(Request $request)
{
$view = parent::getView($request);
$queryParams = $request->getQueryParams();
$page = max(1, array_get($queryParams, 'page'));
@@ -35,7 +60,7 @@ class DiscussionController extends ClientController
]
];
$document = $this->preload($request->getAttribute('actor'), $params);
$document = $this->getDocument($request->getAttribute('actor'), $params);
$getResource = function ($link) use ($document) {
return array_first($document->included, function ($key, $value) use ($link) {
@@ -47,9 +72,8 @@ class DiscussionController extends ClientController
$newQueryParams = array_merge($queryParams, $newQueryParams);
$queryString = http_build_query($newQueryParams);
return app('Flarum\Forum\UrlGenerator')
->toRoute('discussion', ['id' => $document->data->id]).
($queryString ? '?'.$queryString : '');
return $this->url->toRoute('discussion', ['id' => $document->data->id]).
($queryString ? '?'.$queryString : '');
};
$posts = [];
@@ -75,7 +99,7 @@ class DiscussionController extends ClientController
* @return object
* @throws RouteNotFoundException
*/
protected function preload(User $actor, array $params)
protected function getDocument(User $actor, array $params)
{
$response = $this->api->send('Flarum\Api\Controller\ShowDiscussionController', $actor, $params);
$statusCode = $response->getStatusCode();