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

Type and cs fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-03-07 00:23:17 +01:00
parent f68c2d53c2
commit 9bbc8e5baf
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Controller/ApiController.php
View File

@ -15,15 +15,17 @@ declare(strict_types=1);
namespace Modules\Helper\Controller; namespace Modules\Helper\Controller;
use Modules\Admin\Models\AccountPermission; use Modules\Admin\Models\AccountPermission;
use Modules\Admin\Models\NullAccount;
use Modules\Helper\Models\NullReport; use Modules\Helper\Models\NullReport;
use Modules\Helper\Models\NullTemplate;
use Modules\Helper\Models\PermissionState; use Modules\Helper\Models\PermissionState;
use Modules\Helper\Models\Report; use Modules\Helper\Models\Report;
use Modules\Helper\Models\ReportMapper; use Modules\Helper\Models\ReportMapper;
use Modules\Helper\Models\Template; use Modules\Helper\Models\Template;
use Modules\Helper\Models\TemplateDataType; use Modules\Helper\Models\TemplateDataType;
use Modules\Helper\Models\TemplateMapper; use Modules\Helper\Models\TemplateMapper;
use Modules\Media\Models\NullCollection;
use Modules\Media\Models\NullCollection;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
use phpOMS\DataStorage\Database\Query\Builder; use phpOMS\DataStorage\Database\Query\Builder;
use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpRequest;
@ -301,12 +303,12 @@ final class ApiController extends Controller
$helperTemplate->setDescriptionRaw((string) ($request->getData('description') ?? '')); $helperTemplate->setDescriptionRaw((string) ($request->getData('description') ?? ''));
if ($collectionId > 0) { if ($collectionId > 0) {
$helperTemplate->setSource($collectionId); $helperTemplate->setSource(new NullCollection($collectionId));
} }
$helperTemplate->setStandalone((bool) ($request->getData('standalone') ?? false)); $helperTemplate->setStandalone((bool) ($request->getData('standalone') ?? false));
$helperTemplate->setExpected(!empty($expected) ? \json_decode($expected, true) : []); $helperTemplate->setExpected(!empty($expected) ? \json_decode($expected, true) : []);
$helperTemplate->setCreatedBy($request->getHeader()->getAccount()); $helperTemplate->setCreatedBy(new NullAccount($request->getHeader()->getAccount()));
$helperTemplate->setDatatype((int) ($request->getData('datatype') ?? TemplateDataType::OTHER)); $helperTemplate->setDatatype((int) ($request->getData('datatype') ?? TemplateDataType::OTHER));
return $helperTemplate; return $helperTemplate;
@ -383,9 +385,9 @@ final class ApiController extends Controller
{ {
$helperReport = new Report(); $helperReport = new Report();
$helperReport->setTitle((string) ($request->getData('name'))); $helperReport->setTitle((string) ($request->getData('name')));
$helperReport->setSource($collectionId); $helperReport->setSource(new NullCollection($collectionId));
$helperReport->setTemplate((int) $request->getData('template')); $helperReport->setTemplate(new NullTemplate((int) $request->getData('template')));
$helperReport->setCreatedBy($request->getHeader()->getAccount()); $helperReport->setCreatedBy(new NullAccount($request->getHeader()->getAccount()));
return $helperReport; return $helperReport;
} }

2
Models/ReportMapper.php
View File

@ -48,7 +48,7 @@ final class ReportMapper extends DataMapperAbstract
/** /**
* Has one relation. * Has one relation.
* *
* @var array<string, array{mapper:string, self:string, by?:string}> * @var array<string, array{mapper:string, self:string, by?:string, column?:string}>
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $ownsOne = [ protected static array $ownsOne = [

4
Models/TemplateMapper.php
View File

@ -53,7 +53,7 @@ final class TemplateMapper extends DataMapperAbstract
/** /**
* Has one relation. * Has one relation.
* *
* @var array<string, array{mapper:string, self:string, by?:string}> * @var array<string, array{mapper:string, self:string, by?:string, column?:string}>
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $ownsOne = [ protected static array $ownsOne = [
@ -83,7 +83,7 @@ final class TemplateMapper extends DataMapperAbstract
/** /**
* Has many relation. * Has many relation.
* *
* @var array<string, array{mapper:string, table:string, self?:?string, external?:?string}> * @var array<string, array{mapper:string, table:string, self?:?string, external?:?string, column?:string}>
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $hasMany = [ protected static array $hasMany = [