github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-05 00:43:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweak ContentInterface so that callables can be used as well

Browse Source
This commit is contained in:
Franz Liedke 2018-10-21 20:41:10 +02:00
parent 52d7cd0461
commit d335ce8eef
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Admin/Content/AdminPayload.php
View File

@ -52,7 +52,7 @@ class AdminPayload implements ContentInterface
$this->events = $events; $this->events = $events;
} }
public function populate(HtmlDocument $document, Request $request) public function __invoke(HtmlDocument $document, Request $request)
{ {
$settings = $this->settings->all(); $settings = $this->settings->all();

2
framework/core/src/Forum/Content/AssertRegistered.php
View File

@ -20,7 +20,7 @@ class AssertRegistered implements ContentInterface
{ {
use AssertPermissionTrait; use AssertPermissionTrait;
public function populate(HtmlDocument $document, Request $request) public function __invoke(HtmlDocument $document, Request $request)
{ {
$this->assertRegistered($request->getAttribute('actor')); $this->assertRegistered($request->getAttribute('actor'));
} }

2
framework/core/src/Forum/Content/Discussion.php
View File

@ -49,7 +49,7 @@ class Discussion implements ContentInterface
$this->view = $view; $this->view = $view;
} }
public function populate(HtmlDocument $document, Request $request) public function __invoke(HtmlDocument $document, Request $request)
{ {
$queryParams = $request->getQueryParams(); $queryParams = $request->getQueryParams();
$page = max(1, array_get($queryParams, 'page')); $page = max(1, array_get($queryParams, 'page'));

2
framework/core/src/Forum/Content/Index.php
View File

@ -44,7 +44,7 @@ class Index implements ContentInterface
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function populate(HtmlDocument $document, Request $request) public function __invoke(HtmlDocument $document, Request $request)
{ {
$queryParams = $request->getQueryParams(); $queryParams = $request->getQueryParams();

2
framework/core/src/Frontend/Content/ContentInterface.php
View File

@ -20,5 +20,5 @@ interface ContentInterface
* @param HtmlDocument $document * @param HtmlDocument $document
* @param Request $request * @param Request $request
*/ */
public function populate(HtmlDocument $document, Request $request); public function __invoke(HtmlDocument $document, Request $request);
} }

2
framework/core/src/Frontend/Content/CorePayload.php
View File

@ -41,7 +41,7 @@ class CorePayload implements ContentInterface
$this->api = $api; $this->api = $api;
} }
public function populate(HtmlDocument $document, Request $request) public function __invoke(HtmlDocument $document, Request $request)
{ {
$document->payload = array_merge( $document->payload = array_merge(
$document->payload, $document->payload,

2
framework/core/src/Frontend/Content/Layout.php
View File

@ -29,7 +29,7 @@ class Layout implements ContentInterface
$this->layoutView = $layoutView; $this->layoutView = $layoutView;
} }
public function populate(HtmlDocument $document, Request $request) public function __invoke(HtmlDocument $document, Request $request)
{ {
$document->layoutView = $this->layoutView; $document->layoutView = $this->layoutView;
} }

2
framework/core/src/Frontend/Content/Meta.php
View File

@ -16,7 +16,7 @@ use Psr\Http\Message\ServerRequestInterface as Request;
class Meta implements ContentInterface class Meta implements ContentInterface
{ {
public function populate(HtmlDocument $document, Request $request) public function __invoke(HtmlDocument $document, Request $request)
{ {
$document->meta = array_merge($document->meta, $this->buildMeta($document)); $document->meta = array_merge($document->meta, $this->buildMeta($document));
$document->head = array_merge($document->head, $this->buildHead($document)); $document->head = array_merge($document->head, $this->buildHead($document));

4
framework/core/src/Frontend/HtmlDocumentFactory.php
View File

@ -61,7 +61,7 @@ class HtmlDocumentFactory
} }
/** /**
* @param ContentInterface $content * @param ContentInterface|callable $content
*/ */
public function add($content) public function add($content)
{ {
@ -116,7 +116,7 @@ class HtmlDocumentFactory
protected function populate(HtmlDocument $view, Request $request) protected function populate(HtmlDocument $view, Request $request)
{ {
foreach ($this->content as $content) { foreach ($this->content as $content) {
$content->populate($view, $request); $content($view, $request);
} }
} }