Jingga/oms-Script
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Script.git synced 2026-01-13 13:28:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

phpcs+phpstan fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2019-02-07 00:05:31 +01:00
parent 6076f244c4
commit 3a71c45c68
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin/Install/Navigation.php
View File

@ -36,7 +36,7 @@ class Navigation
*
* @since 1.0.0
*/
public static function install(string $path = null, DatabasePool $dbPool = null) : void
public static function install(string $path, DatabasePool $dbPool) : void
{
\Modules\Navigation\Admin\Installer::installExternal($dbPool, ['path' => __DIR__ . '/Navigation.install.json']);
}

2
Controller/ApiController.php
View File

@ -182,8 +182,6 @@ final class ApiController extends Controller
$tcoll['js'] = $tMedia;
} elseif (StringUtils::endsWith($lowerPath, '.sqlite') || StringUtils::endsWith($lowerPath, '.db')) {
$tcoll['db'][] = $tMedia;
} else {
// Do nothing; only the creator knows how to deal with this type of file :)
}
}

21
Controller/BackendController.php
View File

@ -25,6 +25,7 @@ use Modules\Helper\Models\TemplateMapper;
use phpOMS\Account\PermissionType;
use phpOMS\Asset\AssetType;
use phpOMS\Contract\RenderableInterface;
use phpOMS\DataStorage\Database\Query\Builder;
use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\RequestAbstract;
@ -57,12 +58,12 @@ final class BackendController extends Controller
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
*
* @return \Serializable
* @return RenderableInterface
*
* @since 1.0.0
* @codeCoverageIgnore
*/
public function viewTemplateList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
public function viewTemplateList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
@ -80,12 +81,12 @@ final class BackendController extends Controller
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
*
* @return \Serializable
* @return RenderableInterface
*
* @since 1.0.0
* @codeCoverageIgnore
*/
public function viewTemplateCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
public function viewTemplateCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
@ -104,12 +105,12 @@ final class BackendController extends Controller
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
*
* @return \Serializable
* @return RenderableInterface
*
* @since 1.0.0
* @codeCoverageIgnore
*/
public function viewReportCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
public function viewReportCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
@ -128,14 +129,14 @@ final class BackendController extends Controller
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
*
* @return \Serializable
* @return RenderableInterface
*
* @throws \Exception
*
* @since 1.0.0
* @codeCoverageIgnore
*/
public function viewHelperReport(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
public function viewHelperReport(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
//$file = preg_replace('([^\w\s\d\-_~,;:\.\[\]\(\).])', '', $template->getName());
@ -171,15 +172,13 @@ final class BackendController extends Controller
} elseif (StringUtils::endsWith($lowerPath, '.css')) {
$tcoll['css'] = $tMedia;
/** @var Head $head */
/** @var \phpOMS\Model\Html\Head $head */
$head = $response->get('Content')->getData('head');
$head->addAsset(AssetType::CSS, $request->getUri()->getBase() . $tMedia->getPath());
} elseif (StringUtils::endsWith($lowerPath, '.js')) {
$tcoll['js'] = $tMedia;
} elseif (StringUtils::endsWith($lowerPath, '.sqlite') || StringUtils::endsWith($lowerPath, '.db')) {
$tcoll['db'][] = $tMedia;
} else {
// Do nothing; only the creator knows how to deal with this type of file :)
}
}

2
Models/TemplateMapper.php
View File

@ -72,7 +72,7 @@ final class TemplateMapper extends DataMapperAbstract
/**
* Has many relation.
*
* @var array<string, array<string, string>>
* @var array<string, array<string, null|string>>
* @since 1.0.0
*/
protected static $hasMany = [