Jingga/oms-Media
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Media.git synced 2026-02-14 16:28:41 +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 22464e86d7
commit afc2285249
5 changed files with 22 additions and 16 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 * @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']); \Modules\Navigation\Admin\Installer::installExternal($dbPool, ['path' => __DIR__ . '/Navigation.install.json']);
} }

16
Controller/BackendController.php
View File

@ -20,9 +20,9 @@ use Modules\Media\Models\MediaMapper;
use Modules\Media\Views\MediaView; use Modules\Media\Views\MediaView;
use phpOMS\Asset\AssetType; use phpOMS\Asset\AssetType;
use phpOMS\Contract\RenderableInterface;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Html\Head;
use phpOMS\Views\View; use phpOMS\Views\View;
/** /**
@ -96,7 +96,7 @@ final class BackendController extends Controller
*/ */
public static function setUpFileUploader(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public static function setUpFileUploader(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
/** @var Head $head */ /** @var \phpOMS\Model\Html\Head $head */
$head = $response->get('Content')->getData('head'); $head = $response->get('Content')->getData('head');
$head->addAsset(AssetType::JSLATE, '/Modules/Media/Models/Upload.js'); $head->addAsset(AssetType::JSLATE, '/Modules/Media/Models/Upload.js');
$head->addAsset(AssetType::JSLATE, '/Modules/Media/Controller.js'); $head->addAsset(AssetType::JSLATE, '/Modules/Media/Controller.js');
@ -107,12 +107,12 @@ final class BackendController extends Controller
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
* @param mixed $data Generic data * @param mixed $data Generic data
* *
* @return \Serializable * @return RenderableInterface
* *
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function viewMediaList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable public function viewMediaList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Media/Theme/Backend/media-list'); $view->setTemplate('/Modules/Media/Theme/Backend/media-list');
@ -129,12 +129,12 @@ final class BackendController extends Controller
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
* @param mixed $data Generic data * @param mixed $data Generic data
* *
* @return \Serializable * @return RenderableInterface
* *
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function viewMediaSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable public function viewMediaSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new MediaView($this->app, $request, $response); $view = new MediaView($this->app, $request, $response);
$view->setTemplate('/Modules/Media/Theme/Backend/media-single'); $view->setTemplate('/Modules/Media/Theme/Backend/media-single');
@ -155,12 +155,12 @@ final class BackendController extends Controller
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
* @param mixed $data Generic data * @param mixed $data Generic data
* *
* @return \Serializable * @return RenderableInterface
* *
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function viewMediaCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable public function viewMediaCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Media/Theme/Backend/media-create'); $view->setTemplate('/Modules/Media/Theme/Backend/media-create');

2
Models/Collection.php
View File

@ -28,7 +28,7 @@ class Collection extends Media implements \Iterator
/** /**
* Resource id. * Resource id.
* *
* @var int[] * @var array<int|Media>
* @since 1.0.0 * @since 1.0.0
*/ */
private $sources = []; private $sources = [];

16
Models/CollectionMapper.php
View File

@ -4,7 +4,7 @@
* *
* PHP Version 7.2 * PHP Version 7.2
* *
* @package TBD * @package Modules\Media
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 1.0
* @version 1.0.0 * @version 1.0.0
@ -14,12 +14,20 @@ declare(strict_types=1);
namespace Modules\Media\Models; namespace Modules\Media\Models;
/**
* Mapper class.
*
* @package Modules\Media
* @license OMS License 1.0
* @link http://website.orange-management.de
* @since 1.0.0
*/
final class CollectionMapper extends MediaMapper final class CollectionMapper extends MediaMapper
{ /** {
/**
* Has many relation. * Has many relation.
* *
* @var array<string, array<string, string>> * @var array<string, array<string, null|string>>
* @since 1.0.0 * @since 1.0.0
*/ */
protected static $hasMany = [ protected static $hasMany = [

2
Theme/Backend/media-single.tpl.php
View File

@ -19,8 +19,6 @@ include __DIR__ . '/template-functions.php';
/** /**
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
*/
/**
* @var $media \Modules\Media\Models\Media * @var $media \Modules\Media\Models\Media
*/ */
$media = $this->getData('media'); $media = $this->getData('media');