mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-05 07:57:46 +02:00
Code Issues Releases Wiki Activity

Apply fixes from StyleCI

Browse Source 
[ci skip] [skip ci]
This commit is contained in:
luceos
2021-04-22 12:06:47 +00:00
committed by StyleCI Bot
parent cd0a31a6e7
commit e3435a3f30
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Formatter/Formatter.php
View File

@@ -253,16 +253,20 @@ class Formatter extends RevisionCompiler
protected function ensureRendererExists() protected function ensureRendererExists()
{ {
if (! static::$formatter) return; if (! static::$formatter) {
return;
}
$revision = $this->getRevision(); $revision = $this->getRevision();
if (file_exists($this->cacheDir . "/Renderer_$revision.php")) return; if (file_exists($this->cacheDir."/Renderer_$revision.php")) {
return;
}
$renderer = Arr::get(static::$formatter, 'renderer'); $renderer = Arr::get(static::$formatter, 'renderer');
if (! empty($renderer)) { if (! empty($renderer)) {
file_put_contents($this->cacheDir . "/Renderer_$revision.php", $renderer); file_put_contents($this->cacheDir."/Renderer_$revision.php", $renderer);
} else { } else {
$this->finalize(); $this->finalize();
} }
@@ -272,7 +276,7 @@ class Formatter extends RevisionCompiler
if ($renderer && static::$formatter['renderer'] instanceof __PHP_Incomplete_Class) { if ($renderer && static::$formatter['renderer'] instanceof __PHP_Incomplete_Class) {
// Autoload the file from disk using a simple include, while suppressing errors. // Autoload the file from disk using a simple include, while suppressing errors.
@include $this->cacheDir . "/Renderer_$revision.php"; @include $this->cacheDir."/Renderer_$revision.php";
// Reload the formatter again from cache to resolve the __PHP_Incomplete_Class // Reload the formatter again from cache to resolve the __PHP_Incomplete_Class
static::$formatter = $this->cache->get('flarum.formatter'); static::$formatter = $this->cache->get('flarum.formatter');
@@ -293,9 +297,13 @@ class Formatter extends RevisionCompiler
protected function requiresRefresh(): bool protected function requiresRefresh(): bool
{ {
if (! $this->getRevision()) return true; if (! $this->getRevision()) {
return true;
}
if (! Arr::get(static::$formatter, 'renderer')) return true; if (! Arr::get(static::$formatter, 'renderer')) {
return true;
}
$renderer = static::$formatter['renderer'] instanceof __PHP_Incomplete_Class $renderer = static::$formatter['renderer'] instanceof __PHP_Incomplete_Class
? (new ArrayObject(static::$formatter['renderer']))['__PHP_Incomplete_Class_Name'] ? (new ArrayObject(static::$formatter['renderer']))['__PHP_Incomplete_Class_Name']