This commit is contained in:
Dennis Eichhorn 2024-05-03 22:43:26 +00:00
parent 365c41ce34
commit 7fd3b4e59b
36 changed files with 139 additions and 139 deletions

View File

@ -4,7 +4,7 @@
*
* PHP Version 8.2
*
* @package Modules\Helper\Admin\Install
* @package Modules\Script\Admin\Install
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
@ -12,14 +12,14 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Admin\Install;
namespace Modules\Script\Admin\Install;
use phpOMS\Application\ApplicationAbstract;
/**
* Media class.
*
* @package Modules\Helper\Admin\Install
* @package Modules\Script\Admin\Install
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0

View File

@ -4,7 +4,7 @@
*
* PHP Version 8.2
*
* @package Modules\Helper\Admin\Install
* @package Modules\Script\Admin\Install
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
@ -12,14 +12,14 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Admin\Install;
namespace Modules\Script\Admin\Install;
use phpOMS\Application\ApplicationAbstract;
/**
* Navigation class.
*
* @package Modules\Helper\Admin\Install
* @package Modules\Script\Admin\Install
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0

View File

@ -4,7 +4,7 @@
*
* PHP Version 8.2
*
* @package Modules\Helper\Admin
* @package Modules\Script\Admin
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
@ -12,14 +12,14 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Admin;
namespace Modules\Script\Admin;
use phpOMS\Module\InstallerAbstract;
/**
* Installer class.
*
* @package Modules\Helper\Admin
* @package Modules\Script\Admin
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0

View File

@ -12,15 +12,15 @@
*/
declare(strict_types=1);
use Modules\Helper\Controller\ApiController;
use Modules\Helper\Models\PermissionCategory;
use Modules\Script\Controller\ApiController;
use Modules\Script\Models\PermissionCategory;
use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb;
return [
'^.*/helper/report/export(\?.*$|$)' => [
[
'dest' => '\Modules\Helper\Controller\ApiController:apiHelperExport',
'dest' => '\Modules\Script\Controller\ApiController:apiHelperExport',
'verb' => RouteVerb::GET,
'csrf' => true,
'active' => true,
@ -33,7 +33,7 @@ return [
],
'^.*/helper/report/template(\?.*$|$)' => [
[
'dest' => '\Modules\Helper\Controller\ApiController:apiTemplateCreate',
'dest' => '\Modules\Script\Controller\ApiController:apiTemplateCreate',
'verb' => RouteVerb::SET,
'csrf' => true,
'active' => true,
@ -46,7 +46,7 @@ return [
],
'^.*/helper/report/report(\?.*$|$)' => [
[
'dest' => '\Modules\Helper\Controller\ApiController:apiReportCreate',
'dest' => '\Modules\Script\Controller\ApiController:apiReportCreate',
'verb' => RouteVerb::SET,
'csrf' => true,
'active' => true,

View File

@ -12,15 +12,15 @@
*/
declare(strict_types=1);
use Modules\Helper\Controller\BackendController;
use Modules\Helper\Models\PermissionCategory;
use Modules\Script\Controller\BackendController;
use Modules\Script\Models\PermissionCategory;
use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb;
return [
'^/helper/template/create(\?.*$|$)' => [
[
'dest' => '\Modules\Helper\Controller\BackendController:viewTemplateCreate',
'dest' => '\Modules\Script\Controller\BackendController:viewTemplateCreate',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
@ -32,7 +32,7 @@ return [
],
'^/helper/report/create(\?.*$|$)' => [
[
'dest' => '\Modules\Helper\Controller\BackendController:viewReportCreate',
'dest' => '\Modules\Script\Controller\BackendController:viewReportCreate',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
@ -44,7 +44,7 @@ return [
],
'^/helper/list(\?.*$|$)' => [
[
'dest' => '\Modules\Helper\Controller\BackendController:viewTemplateList',
'dest' => '\Modules\Script\Controller\BackendController:viewTemplateList',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
@ -56,7 +56,7 @@ return [
],
'^/helper/report/view(\?.*$|$)' => [
[
'dest' => '\Modules\Helper\Controller\BackendController:viewHelperReport',
'dest' => '\Modules\Script\Controller\BackendController:viewHelperReport',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [

View File

@ -4,7 +4,7 @@
*
* PHP Version 8.2
*
* @package Modules\Helper\Admin
* @package Modules\Script\Admin
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
@ -12,14 +12,14 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Admin;
namespace Modules\Script\Admin;
use phpOMS\Module\StatusAbstract;
/**
* Status class.
*
* @package Modules\Helper\Admin
* @package Modules\Script\Admin
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0

View File

@ -4,7 +4,7 @@
*
* PHP Version 8.2
*
* @package Modules\Helper\Admin
* @package Modules\Script\Admin
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
@ -12,14 +12,14 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Admin;
namespace Modules\Script\Admin;
use phpOMS\Module\UninstallerAbstract;
/**
* Uninstaller class.
*
* @package Modules\Helper\Admin
* @package Modules\Script\Admin
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0

View File

@ -4,7 +4,7 @@
*
* PHP Version 8.2
*
* @package Modules\Helper\Admin
* @package Modules\Script\Admin
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
@ -12,14 +12,14 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Admin;
namespace Modules\Script\Admin;
use phpOMS\Module\UpdaterAbstract;
/**
* Updater class.
*
* @package Modules\Helper\Admin
* @package Modules\Script\Admin
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0

View File

@ -12,17 +12,17 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Controller;
namespace Modules\Script\Controller;
use Modules\Admin\Models\AccountPermission;
use Modules\Admin\Models\NullAccount;
use Modules\Helper\Models\NullTemplate;
use Modules\Helper\Models\PermissionCategory;
use Modules\Helper\Models\Report;
use Modules\Helper\Models\ReportMapper;
use Modules\Helper\Models\Template;
use Modules\Helper\Models\TemplateDataType;
use Modules\Helper\Models\TemplateMapper;
use Modules\Script\Models\NullTemplate;
use Modules\Script\Models\PermissionCategory;
use Modules\Script\Models\Report;
use Modules\Script\Models\ReportMapper;
use Modules\Script\Models\Template;
use Modules\Script\Models\TemplateDataType;
use Modules\Script\Models\TemplateMapper;
use Modules\Media\Models\NullCollection;
use Modules\Media\Models\NullMedia;
use Modules\Media\Models\PathSettings;

View File

@ -12,11 +12,11 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Controller;
namespace Modules\Script\Controller;
use Modules\Helper\Models\ReportMapper;
use Modules\Helper\Models\Template;
use Modules\Helper\Models\TemplateMapper;
use Modules\Script\Models\ReportMapper;
use Modules\Script\Models\Template;
use Modules\Script\Models\TemplateMapper;
use Modules\Media\Models\CollectionMapper;
use Modules\Media\Models\Media;
use phpOMS\Contract\RenderableInterface;
@ -207,7 +207,7 @@ final class BackendController extends Controller
return $view;
}
/** @var \Modules\Helper\Models\Report $report */
/** @var \Modules\Script\Models\Report $report */
$report = ReportMapper::get()
->where('template', $template->id)
->sort('id', OrderType::DESC)

View File

@ -12,7 +12,7 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Controller;
namespace Modules\Script\Controller;
use phpOMS\Module\ModuleAbstract;

View File

@ -4,7 +4,7 @@
*
* PHP Version 8.2
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
@ -12,12 +12,12 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Models;
namespace Modules\Script\Models;
/**
* Report model.
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0

View File

@ -4,7 +4,7 @@
*
* PHP Version 8.2
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
@ -12,12 +12,12 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Models;
namespace Modules\Script\Models;
/**
* Report model.
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0

View File

@ -4,7 +4,7 @@
*
* PHP Version 8.2
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
@ -12,14 +12,14 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Models;
namespace Modules\Script\Models;
use phpOMS\Stdlib\Base\Enum;
/**
* Permission category enum.
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0

View File

@ -4,7 +4,7 @@
*
* PHP Version 8.2
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
@ -12,14 +12,14 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Models;
namespace Modules\Script\Models;
use phpOMS\Stdlib\Base\Enum;
/**
* Permission category enum.
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0

View File

@ -4,7 +4,7 @@
*
* PHP Version 8.2
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
@ -12,7 +12,7 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Models;
namespace Modules\Script\Models;
use Modules\Admin\Models\Account;
use Modules\Admin\Models\NullAccount;
@ -22,7 +22,7 @@ use Modules\Media\Models\NullCollection;
/**
* Report model.
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
@ -43,7 +43,7 @@ class Report implements \JsonSerializable
* @var int
* @since 1.0.0
*/
public int $status = HelperStatus::INACTIVE;
public int $status = ScriptStatus::INACTIVE;
/**
* Report title.

View File

@ -4,7 +4,7 @@
*
* PHP Version 8.2
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
@ -12,7 +12,7 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Models;
namespace Modules\Script\Models;
use Modules\Admin\Models\AccountMapper;
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
/**
* Report mapper class.
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0

8
Models/HelperStatus.php → Models/ScriptStatus.php Executable file → Normal file
View File

@ -4,7 +4,7 @@
*
* PHP Version 8.2
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
@ -12,19 +12,19 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Models;
namespace Modules\Script\Models;
use phpOMS\Stdlib\Base\Enum;
/**
* Helper status.
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/
abstract class HelperStatus extends Enum
abstract class ScriptStatus extends Enum
{
public const INACTIVE = 1;

View File

@ -4,7 +4,7 @@
*
* PHP Version 8.2
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
@ -12,7 +12,7 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Models;
namespace Modules\Script\Models;
use Modules\Admin\Models\Account;
use Modules\Admin\Models\NullAccount;
@ -25,7 +25,7 @@ use Modules\Tag\Models\Tag;
/**
* Template model.
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
@ -54,7 +54,7 @@ class Template implements \JsonSerializable
* @var int
* @since 1.0.0
*/
public int $status = HelperStatus::INACTIVE;
public int $status = ScriptStatus::INACTIVE;
/**
* Template data type.

View File

@ -4,7 +4,7 @@
*
* PHP Version 8.2
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
@ -12,14 +12,14 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Models;
namespace Modules\Script\Models;
use phpOMS\Stdlib\Base\Enum;
/**
* Helper status.
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0

View File

@ -4,7 +4,7 @@
*
* PHP Version 8.2
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
@ -12,7 +12,7 @@
*/
declare(strict_types=1);
namespace Modules\Helper\Models;
namespace Modules\Script\Models;
use Modules\Admin\Models\AccountMapper;
use Modules\Media\Models\CollectionMapper;
@ -23,7 +23,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
/**
* Report mapper class.
*
* @package Modules\Helper\Models
* @package Modules\Script\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0

View File

@ -17,7 +17,7 @@ use phpOMS\Uri\UriFactory;
/**
* @var \phpOMS\Views\View $this
*/
$templateList = \Modules\Helper\Models\TemplateMapper::getAll()->executeGetArray();
$templateList = \Modules\Script\Models\TemplateMapper::getAll()->executeGetArray();
echo $this->data['nav']->render(); ?>

View File

@ -16,7 +16,7 @@ use phpOMS\Uri\UriFactory;
/**
* @var \phpOMS\Views\View $this
* @var \Modules\Helper\Models\Template[] $templates
* @var \Modules\Script\Models\Template[] $templates
*/
$templates = $this->data['reports'];

View File

@ -12,8 +12,8 @@
*/
declare(strict_types=1);
use Modules\Helper\Models\NullReport;
use Modules\Helper\Models\NullTemplate;
use Modules\Script\Models\NullReport;
use Modules\Script\Models\NullTemplate;
use phpOMS\Model\Html\FormElementGenerator;
use phpOMS\Uri\UriFactory;
@ -32,10 +32,10 @@ $rcoll = $this->data['rcoll'] ?? [];
/** @var string $cLang */
$cLang = $this->data['lang'] ?? 'en';
/** @var \Modules\Helper\Models\Template $template */
/** @var \Modules\Script\Models\Template $template */
$template = $this->data['template'] ?? new NullTemplate();
/** @var \Modules\Helper\Models\Report $report */
/** @var \Modules\Script\Models\Report $report */
$report = $this->data['report'] ?? new NullReport();
/** @noinspection PhpIncludeInspection */
@ -137,7 +137,7 @@ echo $this->data['nav']->render(); ?>
<table class="list wf-100">
<tbody>
<?php if (!$template->isStandalone
&& !($report instanceof \Modules\Helper\Models\NullReport)
&& !($report instanceof \Modules\Script\Models\NullReport)
) : ?>
<tr>
<th colspan="2"><?= $this->getHtml('Report'); ?>

View File

@ -1,8 +1,8 @@
{
"name": {
"id": 1002700000,
"internal": "Helper",
"external": "Helper"
"internal": "Script",
"external": "Script"
},
"category": "Tools",
"version": "1.0.0",
@ -15,7 +15,7 @@
"website": "jingga.app"
},
"description": "The helper module supports creating static and dynamic reportings.",
"directory": "Helper",
"directory": "Script",
"dependencies": {
"Admin": "1.0.0",
"Media": "1.0.0",
@ -32,15 +32,15 @@
],
"type": 4,
"for": "Content",
"file": "Helper",
"from": "Helper"
"file": "Script",
"from": "Script"
},
{
"pid": [
"/"
],
"type": 5,
"from": "Helper",
"from": "Script",
"for": "Navigation",
"file": "Navigation"
}

View File

@ -12,7 +12,7 @@
*/
declare(strict_types=1);
namespace Modules\Helper\tests\Admin;
namespace Modules\Script\tests\Admin;
/**
* @internal

View File

@ -12,9 +12,9 @@
*/
declare(strict_types=1);
namespace Modules\Helper\tests;
namespace Modules\Script\tests;
\spl_autoload_register('\Modules\Helper\tests\Autoloader::defaultAutoloader');
\spl_autoload_register('\Modules\Script\tests\Autoloader::defaultAutoloader');
/**
* Autoloader class.

View File

@ -4,7 +4,7 @@
*
* PHP Version 8.2
*
* @package Modules\Helper\tests
* @package Modules\Script\tests
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0

View File

@ -12,7 +12,7 @@
*/
declare(strict_types=1);
namespace Modules\Helper\tests\Controller;
namespace Modules\Script\tests\Controller;
use Model\CoreSettings;
use Modules\Admin\Models\AccountPermission;
@ -36,14 +36,14 @@ use phpOMS\Utils\TestUtils;
/**
* @internal
*/
#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Helper\Controller\ApiController::class)]
#[\PHPUnit\Framework\Attributes\TestDox('Modules\Helper\tests\Controller\ApiControllerTest: Helper api controller')]
#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Script\Controller\ApiController::class)]
#[\PHPUnit\Framework\Attributes\TestDox('Modules\Script\tests\Controller\ApiControllerTest: Helper api controller')]
final class ApiControllerTest extends \PHPUnit\Framework\TestCase
{
protected ApplicationAbstract $app;
/**
* @var \Modules\Helper\Controller\ApiController
* @var \Modules\Script\Controller\ApiController
*/
protected ModuleAbstract $module;

View File

@ -12,7 +12,7 @@
*/
declare(strict_types=1);
namespace Modules\Helper\tests;
namespace Modules\Script\tests;
use Model\CoreSettings;
use Modules\Admin\Models\AccountPermission;

View File

@ -12,20 +12,20 @@
*/
declare(strict_types=1);
namespace Modules\Helper\tests\Models;
namespace Modules\Script\tests\Models;
use Modules\Helper\Models\NullReport;
use Modules\Script\Models\NullReport;
/**
* @internal
*/
#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Helper\Models\NullReport::class)]
#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Script\Models\NullReport::class)]
final class NullReportTest extends \PHPUnit\Framework\TestCase
{
#[\PHPUnit\Framework\Attributes\Group('module')]
public function testNull() : void
{
self::assertInstanceOf('\Modules\Helper\Models\Report', new NullReport());
self::assertInstanceOf('\Modules\Script\Models\Report', new NullReport());
}
#[\PHPUnit\Framework\Attributes\Group('module')]

View File

@ -12,20 +12,20 @@
*/
declare(strict_types=1);
namespace Modules\Helper\tests\Models;
namespace Modules\Script\tests\Models;
use Modules\Helper\Models\NullTemplate;
use Modules\Script\Models\NullTemplate;
/**
* @internal
*/
#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Helper\Models\NullTemplate::class)]
#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Script\Models\NullTemplate::class)]
final class NullTemplateTest extends \PHPUnit\Framework\TestCase
{
#[\PHPUnit\Framework\Attributes\Group('module')]
public function testNull() : void
{
self::assertInstanceOf('\Modules\Helper\Models\Template', new NullTemplate());
self::assertInstanceOf('\Modules\Script\Models\Template', new NullTemplate());
}
#[\PHPUnit\Framework\Attributes\Group('module')]

View File

@ -12,21 +12,21 @@
*/
declare(strict_types=1);
namespace Modules\Helper\tests\Models;
namespace Modules\Script\tests\Models;
use Modules\Admin\Models\NullAccount;
use Modules\Helper\Models\HelperStatus;
use Modules\Helper\Models\Report;
use Modules\Helper\Models\ReportMapper;
use Modules\Helper\Models\Template;
use Modules\Helper\Models\TemplateDataType;
use Modules\Script\Models\ScriptStatus;
use Modules\Script\Models\Report;
use Modules\Script\Models\ReportMapper;
use Modules\Script\Models\Template;
use Modules\Script\Models\TemplateDataType;
use Modules\Media\Models\Collection;
use Modules\Media\Models\Media;
/**
* @internal
*/
#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Helper\Models\ReportMapper::class)]
#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Script\Models\ReportMapper::class)]
#[\PHPUnit\Framework\Attributes\TestDox('Modules\tests\Helper\Models\ReportMapperTest: Report database mapper')]
final class ReportMapperTest extends \PHPUnit\Framework\TestCase
{
@ -36,7 +36,7 @@ final class ReportMapperTest extends \PHPUnit\Framework\TestCase
$template->createdBy = new NullAccount(1);
$template->name = 'Report Template';
$template->status = HelperStatus::ACTIVE;
$template->status = ScriptStatus::ACTIVE;
$template->description = 'Description';
$template->setDatatype(TemplateDataType::OTHER);
$template->isStandalone = false;
@ -107,7 +107,7 @@ final class ReportMapperTest extends \PHPUnit\Framework\TestCase
$report->createdBy = new NullAccount(1);
$report->title = 'Title';
$report->status = HelperStatus::ACTIVE;
$report->status = ScriptStatus::ACTIVE;
$report->description = 'Description';
$report->template = $this->createTemplate();

View File

@ -12,18 +12,18 @@
*/
declare(strict_types=1);
namespace Modules\Helper\tests\Models;
namespace Modules\Script\tests\Models;
use Modules\Admin\Models\NullAccount;
use Modules\Helper\Models\HelperStatus;
use Modules\Helper\Models\NullTemplate;
use Modules\Helper\Models\Report;
use Modules\Script\Models\ScriptStatus;
use Modules\Script\Models\NullTemplate;
use Modules\Script\Models\Report;
use Modules\Media\Models\NullCollection;
/**
* @internal
*/
#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Helper\Models\Report::class)]
#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Script\Models\Report::class)]
#[\PHPUnit\Framework\Attributes\TestDox('Modules\tests\Helper\Models\ReportTest: Report model')]
final class ReportTest extends \PHPUnit\Framework\TestCase
{
@ -45,7 +45,7 @@ final class ReportTest extends \PHPUnit\Framework\TestCase
self::assertEquals(0, $this->report->createdBy->id);
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->report->createdAt->format('Y-m-d'));
self::assertEquals('', $this->report->title);
self::assertEquals(HelperStatus::INACTIVE, $this->report->status);
self::assertEquals(ScriptStatus::INACTIVE, $this->report->status);
self::assertEquals('', $this->report->description);
self::assertEquals('', $this->report->descriptionRaw);
self::assertEquals(0, $this->report->template->id);
@ -115,7 +115,7 @@ final class ReportTest extends \PHPUnit\Framework\TestCase
'name' => 'testTitle',
'description' => 'testDescription',
'descriptionRaw' => 'testDescriptionRaw',
'status' => HelperStatus::INACTIVE,
'status' => ScriptStatus::INACTIVE,
];
foreach ($expected as $key => $e) {
@ -142,7 +142,7 @@ final class ReportTest extends \PHPUnit\Framework\TestCase
'name' => 'testTitle',
'description' => 'testDescription',
'descriptionRaw' => 'testDescriptionRaw',
'status' => HelperStatus::INACTIVE,
'status' => ScriptStatus::INACTIVE,
];
foreach ($expected as $key => $e) {

View File

@ -12,13 +12,13 @@
*/
declare(strict_types=1);
namespace Modules\Helper\tests\Models;
namespace Modules\Script\tests\Models;
use Modules\Admin\Models\NullAccount;
use Modules\Helper\Models\HelperStatus;
use Modules\Helper\Models\Template;
use Modules\Helper\Models\TemplateDataType;
use Modules\Helper\Models\TemplateMapper;
use Modules\Script\Models\ScriptStatus;
use Modules\Script\Models\Template;
use Modules\Script\Models\TemplateDataType;
use Modules\Script\Models\TemplateMapper;
use Modules\Media\Models\Collection;
use Modules\Media\Models\Media;
use phpOMS\DataStorage\Database\Query\OrderType;
@ -26,7 +26,7 @@ use phpOMS\DataStorage\Database\Query\OrderType;
/**
* @internal
*/
#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Helper\Models\TemplateMapper::class)]
#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Script\Models\TemplateMapper::class)]
#[\PHPUnit\Framework\Attributes\TestDox('Modules\tests\Helper\Models\TemplateMapperTest: Template database mapper')]
final class TemplateMapperTest extends \PHPUnit\Framework\TestCase
{
@ -38,7 +38,7 @@ final class TemplateMapperTest extends \PHPUnit\Framework\TestCase
$template->createdBy = new NullAccount(1);
$template->name = 'Title';
$template->status = HelperStatus::ACTIVE;
$template->status = ScriptStatus::ACTIVE;
$template->description = 'Description';
$template->descriptionRaw = 'DescriptionRaw';
$template->datatype = TemplateDataType::OTHER;

View File

@ -12,13 +12,13 @@
*/
declare(strict_types=1);
namespace Modules\Helper\tests\Models;
namespace Modules\Script\tests\Models;
use Modules\Admin\Models\NullAccount;
use Modules\Helper\Models\HelperStatus;
use Modules\Helper\Models\NullReport;
use Modules\Helper\Models\Template;
use Modules\Helper\Models\TemplateDataType;
use Modules\Script\Models\ScriptStatus;
use Modules\Script\Models\NullReport;
use Modules\Script\Models\Template;
use Modules\Script\Models\TemplateDataType;
use Modules\Media\Models\NullCollection;
use Modules\Organization\Models\NullUnit;
use phpOMS\Utils\TestUtils;
@ -26,7 +26,7 @@ use phpOMS\Utils\TestUtils;
/**
* @internal
*/
#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Helper\Models\Template::class)]
#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Script\Models\Template::class)]
#[\PHPUnit\Framework\Attributes\TestDox('Modules\tests\Helper\Models\TemplateTest: Template model')]
final class TemplateTest extends \PHPUnit\Framework\TestCase
{
@ -49,7 +49,7 @@ final class TemplateTest extends \PHPUnit\Framework\TestCase
self::assertEquals(0, $this->template->createdBy->id);
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->template->createdAt->format('Y-m-d'));
self::assertEquals('', $this->template->name);
self::assertEquals(HelperStatus::INACTIVE, $this->template->status);
self::assertEquals(ScriptStatus::INACTIVE, $this->template->status);
self::assertEquals('', $this->template->description);
self::assertEquals('', $this->template->descriptionRaw);
self::assertEquals([], $this->template->getExpected());
@ -158,7 +158,7 @@ final class TemplateTest extends \PHPUnit\Framework\TestCase
'name' => 'testName',
'description' => 'testDescription',
'descriptionRaw' => 'testDescriptionRaw',
'status' => HelperStatus::INACTIVE,
'status' => ScriptStatus::INACTIVE,
'datatype' => TemplateDataType::OTHER,
'standalone' => true,
];
@ -187,7 +187,7 @@ final class TemplateTest extends \PHPUnit\Framework\TestCase
'name' => 'testName',
'description' => 'testDescription',
'descriptionRaw' => 'testDescriptionRaw',
'status' => HelperStatus::INACTIVE,
'status' => ScriptStatus::INACTIVE,
'datatype' => TemplateDataType::OTHER,
'standalone' => true,
];