make id public, organigram impl. media password/encryption, settings bug fix, Money->FloatInt change, ...

This commit is contained in:
Dennis Eichhorn 2023-05-06 11:42:06 +00:00
parent d30973da9b
commit 4f54b27df4
43 changed files with 88 additions and 88 deletions

View File

@ -30,7 +30,7 @@ class Category
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* Title.

View File

@ -30,7 +30,7 @@ class Cause
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
public string $title = '';

View File

@ -32,7 +32,7 @@ class Department
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
public ?OrgDepartment $department = null;

View File

@ -32,7 +32,7 @@ class Process
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
public string $title = '';

View File

@ -32,7 +32,7 @@ class Project
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
public ?PMProject $project = null;

View File

@ -33,7 +33,7 @@ class Risk
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* Name.

View File

@ -30,7 +30,7 @@ class RiskObject
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
public string $title = '';

View File

@ -30,7 +30,7 @@ class Solution
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
public string $title = '';

View File

@ -29,9 +29,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="3">
<tbody>
<?php $c = 0; foreach ($categories as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/category/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/category/single?{?}&id=' . $value->id); ?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
<?php endforeach; ?>
<?php if ($c === 0) : ?>

View File

@ -30,9 +30,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="3">
<tbody>
<?php $c = 0; foreach ($causes as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->id); ?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getRisk()->getName()); ?></a>
<?php endforeach; ?>

View File

@ -43,9 +43,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="6">
<tbody>
<?php $c = 0; foreach ([] as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->id); ?>
<tr>
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
<td>
<td>

View File

@ -29,9 +29,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="3">
<tbody>
<?php $c = 0; foreach ($departments as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/department/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/department/single?{?}&id=' . $value->id); ?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getDepartment()->getName()); ?></a>
<?php endforeach; ?>
<?php if ($c === 0) : ?>

View File

@ -112,9 +112,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="5">
<tbody>
<?php $c = 0; foreach ($risks as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->id); ?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml(\count($value->getCauses())); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml(\count($value->getSolutions())); ?></a>
@ -143,9 +143,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="3">
<tbody>
<?php $c = 0; foreach ($categories as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/category/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/category/single?{?}&id=' . $value->id); ?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
<?php endforeach; ?>
<?php if ($c === 0) : ?>
@ -171,9 +171,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="3">
<tbody>
<?php $c = 0; foreach ($projects as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/project/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/project/single?{?}&id=' . $value->id); ?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getProject()->getName()); ?></a>
<?php endforeach; ?>
<?php if ($c === 0) : ?>
@ -199,9 +199,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="3">
<tbody>
<?php $c = 0; foreach ($processes as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/process/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/process/single?{?}&id=' . $value->id); ?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
<?php endforeach; ?>
<?php if ($c === 0) : ?>
@ -228,9 +228,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="3">
<tbody>
<?php $c = 0; foreach ($causes as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->id); ?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getRisk()->getName()); ?></a>
<?php endforeach; ?>
@ -259,9 +259,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="4">
<tbody>
<?php $c = 0; foreach ($solutions as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/solution/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/solution/single?{?}&id=' . $value->id); ?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getRisk()->getName()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getCause()->getTitle()); ?></a>

View File

@ -29,9 +29,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="3">
<tbody>
<?php $c = 0; foreach ($processes as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/process/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/process/single?{?}&id=' . $value->id); ?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
<?php endforeach; ?>
<?php if ($c === 0) : ?>

View File

@ -29,9 +29,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="3">
<tbody>
<?php $c = 0; foreach ($projects as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/project/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/project/single?{?}&id=' . $value->id); ?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getProject()->getName()); ?></a>
<?php endforeach; ?>
<?php if ($c === 0) : ?>

View File

@ -32,9 +32,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="5">
<tbody>
<?php $c = 0; foreach ($risks as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/risk/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/risk/single?{?}&id=' . $value->id); ?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml(\count($value->getCauses())); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml(\count($value->getSolutions())); ?></a>

View File

@ -32,9 +32,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="4">
<tbody>
<?php $c = 0; foreach ($solutions as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/solution/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/solution/single?{?}&id=' . $value->id); ?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getRisk()->getName()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getCause()->getTitle()); ?></a>

View File

@ -29,9 +29,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="3">
<tbody>
<?php $c = 0; foreach ($units as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/unit/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/unit/single?{?}&id=' . $value->id); ?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
<?php endforeach; ?>
<?php if ($c === 0) : ?>

View File

@ -113,9 +113,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="5">
<tbody>
<?php $c = 0; foreach ($risks as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->id); ?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml(\count($value->getCauses())); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml(\count($value->getSolutions())); ?></a>
@ -144,9 +144,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="3">
<tbody>
<?php $c = 0; foreach ($departments as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/department/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/department/single?{?}&id=' . $value->id); ?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getDepartment()->getName()); ?></a>
<?php endforeach; ?>
<?php if ($c === 0) : ?>
@ -172,9 +172,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="3">
<tbody>
<?php $c = 0; foreach ($categories as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/category/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/category/single?{?}&id=' . $value->id); ?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
<?php endforeach; ?>
<?php if ($c === 0) : ?>
@ -200,9 +200,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="3">
<tbody>
<?php $c = 0; foreach ($projects as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/project/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/project/single?{?}&id=' . $value->id); ?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getProject()->getName()); ?></a>
<?php endforeach; ?>
<?php if ($c === 0) : ?>
@ -228,9 +228,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="3">
<tbody>
<?php $c = 0; foreach ($processes as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/process/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/process/single?{?}&id=' . $value->id); ?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
<?php endforeach; ?>
<?php if ($c === 0) : ?>
@ -257,9 +257,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="3">
<tbody>
<?php $c = 0; foreach ($causes as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->id); ?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getRisk()->getName()); ?></a>
<?php endforeach; ?>
@ -288,9 +288,9 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="4">
<tbody>
<?php $c = 0; foreach ($solutions as $key => $value) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/solution/single?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('riskmanagement/solution/single?{?}&id=' . $value->id); ?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->id; ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getRisk()->getName()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getCause()->getTitle()); ?></a>

View File

@ -36,7 +36,7 @@ final class CategoryMapperTest extends \PHPUnit\Framework\TestCase
CategoryMapper::create()->execute($obj);
$objR = CategoryMapper::get()->where('id', $obj->getId())->execute();
$objR = CategoryMapper::get()->where('id', $obj->id)->execute();
self::assertEquals($obj->title, $objR->title);
self::assertEquals($obj->descriptionRaw, $objR->descriptionRaw);
self::assertEquals($obj->responsible, $objR->responsible);

View File

@ -29,7 +29,7 @@ final class CategoryTest extends \PHPUnit\Framework\TestCase
{
$obj = new Category();
self::assertEquals(0, $obj->getId());
self::assertEquals(0, $obj->id);
self::assertEquals('', $obj->title);
self::assertEquals('', $obj->description);
self::assertEquals('', $obj->descriptionRaw);

View File

@ -54,10 +54,10 @@ final class CauseMapperTest extends \PHPUnit\Framework\TestCase
CauseMapper::create()->execute($obj);
/** @var Cause $objR */
$objR = CauseMapper::get()->with('risk')->with('category')->where('id', $obj->getId())->execute();
$objR = CauseMapper::get()->with('risk')->with('category')->where('id', $obj->id)->execute();
self::assertEquals($obj->title, $objR->title);
self::assertEquals($obj->descriptionRaw, $objR->descriptionRaw);
//self::assertEquals($obj->getDepartment()->department->getId(), $objR->getDepartment()->department->getId());
//self::assertEquals($obj->getDepartment()->department->id, $objR->getDepartment()->department->id);
self::assertEquals($obj->category->title, $objR->category->title);
self::assertEquals($obj->risk->name, $objR->risk->name);
}

View File

@ -29,7 +29,7 @@ final class CauseTest extends \PHPUnit\Framework\TestCase
{
$obj = new Cause();
self::assertEquals(0, $obj->getId());
self::assertEquals(0, $obj->id);
self::assertEquals('', $obj->title);
self::assertEquals('', $obj->description);
self::assertEquals('', $obj->descriptionRaw);

View File

@ -36,8 +36,8 @@ final class DepartmentMapperTest extends \PHPUnit\Framework\TestCase
DepartmentMapper::create()->execute($obj);
$objR = DepartmentMapper::get()->where('id', $obj->getId())->execute();
self::assertEquals($obj->department->getId(), $objR->department->getId());
$objR = DepartmentMapper::get()->where('id', $obj->id)->execute();
self::assertEquals($obj->department->id, $objR->department->id);
self::assertEquals($obj->responsible, $objR->responsible);
self::assertEquals($obj->deputy, $objR->deputy);
}

View File

@ -29,7 +29,7 @@ final class DepartmentTest extends \PHPUnit\Framework\TestCase
{
$obj = new Department();
self::assertEquals(0, $obj->getId());
self::assertEquals(0, $obj->id);
self::assertNull($obj->department);
self::assertNull($obj->responsible);
self::assertNull($obj->deputy);

View File

@ -37,6 +37,6 @@ final class NullCategoryTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullCategory(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

View File

@ -37,6 +37,6 @@ final class NullCauseTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullCause(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

View File

@ -37,6 +37,6 @@ final class NullDepartmentTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullDepartment(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

View File

@ -37,6 +37,6 @@ final class NullProcessTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullProcess(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

View File

@ -37,6 +37,6 @@ final class NullProjectTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullProject(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

View File

@ -37,6 +37,6 @@ final class NullRiskObjectTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullRiskObject(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

View File

@ -37,6 +37,6 @@ final class NullRiskTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullRisk(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

View File

@ -37,6 +37,6 @@ final class NullSolutionTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullSolution(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

View File

@ -40,12 +40,12 @@ final class ProcessMapperTest extends \PHPUnit\Framework\TestCase
ProcessMapper::create()->execute($obj);
$objR = ProcessMapper::get()->where('id', $obj->getId())->execute();
$objR = ProcessMapper::get()->where('id', $obj->id)->execute();
self::assertEquals($obj->title, $objR->title);
self::assertEquals($obj->descriptionRaw, $objR->descriptionRaw);
self::assertEquals($obj->responsible, $objR->responsible);
self::assertEquals($obj->deputy, $objR->deputy);
self::assertEquals($obj->department->getId(), $objR->department->getId());
self::assertEquals($obj->unit->getId(), $objR->unit->getId());
self::assertEquals($obj->department->id, $objR->department->id);
self::assertEquals($obj->unit->id, $objR->unit->id);
}
}

View File

@ -29,7 +29,7 @@ final class ProcessTest extends \PHPUnit\Framework\TestCase
{
$obj = new Process();
self::assertEquals(0, $obj->getId());
self::assertEquals(0, $obj->id);
self::assertEquals('', $obj->title);
self::assertEquals('', $obj->description);
self::assertEquals('', $obj->descriptionRaw);

View File

@ -36,8 +36,8 @@ final class ProjectMapperTest extends \PHPUnit\Framework\TestCase
ProjectMapper::create()->execute($obj);
$objR = ProjectMapper::get()->where('id', $obj->getId())->execute();
self::assertEquals($obj->project->getId(), $objR->project->getId());
$objR = ProjectMapper::get()->where('id', $obj->id)->execute();
self::assertEquals($obj->project->id, $objR->project->id);
self::assertEquals($obj->responsible, $objR->responsible);
self::assertEquals($obj->deputy, $objR->deputy);
}

View File

@ -29,7 +29,7 @@ final class ProjectTest extends \PHPUnit\Framework\TestCase
{
$obj = new Project();
self::assertEquals(0, $obj->getId());
self::assertEquals(0, $obj->id);
self::assertNull($obj->project);
self::assertNull($obj->responsible);
self::assertNull($obj->deputy);

View File

@ -84,16 +84,16 @@ final class RiskMapperTest extends \PHPUnit\Framework\TestCase
RiskMapper::create()->execute($obj);
$objR = RiskMapper::get()->with('project')->with('project/project')->with('causes')->with('solutions')->with('riskObjects')->with('media')->where('id', $obj->getId())->execute();
$objR = RiskMapper::get()->with('project')->with('project/project')->with('causes')->with('solutions')->with('riskObjects')->with('media')->where('id', $obj->id)->execute();
self::assertEquals($obj->name, $objR->name);
self::assertEquals($obj->descriptionRaw, $objR->descriptionRaw);
self::assertEquals($obj->unit->getId(), $objR->unit->getId());
self::assertEquals($obj->department->getId(), $objR->department->getId());
self::assertEquals($obj->category->getId(), $objR->category->getId());
self::assertEquals($obj->process->getId(), $objR->process->getId());
self::assertEquals($obj->unit->id, $objR->unit->id);
self::assertEquals($obj->department->id, $objR->department->id);
self::assertEquals($obj->category->id, $objR->category->id);
self::assertEquals($obj->process->id, $objR->process->id);
self::assertEquals($obj->responsible, $objR->responsible);
self::assertEquals($obj->deputy, $objR->deputy);
self::assertEquals($obj->project->project->getId(), $objR->project->project->getId());
self::assertEquals($obj->project->project->id, $objR->project->project->id);
$causes = $objR->getCauses();
self::assertEquals($obj->getCauses()[0]->title, \end($causes)->title);

View File

@ -35,7 +35,7 @@ final class RiskObjectMapperTest extends \PHPUnit\Framework\TestCase
RiskObjectMapper::create()->execute($obj);
$objR = RiskObjectMapper::get()->where('id', $obj->getId())->execute();
$objR = RiskObjectMapper::get()->where('id', $obj->id)->execute();
self::assertEquals($obj->title, $objR->title);
self::assertEquals($obj->descriptionRaw, $objR->descriptionRaw);
self::assertEquals($obj->risk, $objR->risk);

View File

@ -29,7 +29,7 @@ final class RiskObjectTest extends \PHPUnit\Framework\TestCase
{
$obj = new RiskObject();
self::assertEquals(0, $obj->getId());
self::assertEquals(0, $obj->id);
self::assertEquals('', $obj->title);
self::assertEquals('', $obj->description);
self::assertEquals('', $obj->descriptionRaw);

View File

@ -39,7 +39,7 @@ final class RiskTest extends \PHPUnit\Framework\TestCase
*/
public function testDefault() : void
{
self::assertEquals(0, $this->risk->getId());
self::assertEquals(0, $this->risk->id);
self::assertEquals('', $this->risk->name);
self::assertEquals('', $this->risk->description);
self::assertEquals('', $this->risk->descriptionRaw);

View File

@ -40,11 +40,11 @@ final class SolutionMapperTest extends \PHPUnit\Framework\TestCase
SolutionMapper::create()->execute($obj);
$objR = SolutionMapper::get()->where('id', $obj->getId())->execute();
$objR = SolutionMapper::get()->where('id', $obj->id)->execute();
self::assertEquals($obj->title, $objR->title);
self::assertEquals($obj->descriptionRaw, $objR->descriptionRaw);
self::assertEquals($obj->probability, $objR->probability);
self::assertEquals($obj->risk->getId(), $objR->risk->getId());
self::assertEquals($obj->cause->getId(), $objR->cause->getId());
self::assertEquals($obj->risk->id, $objR->risk->id);
self::assertEquals($obj->cause->id, $objR->cause->id);
}
}

View File

@ -29,7 +29,7 @@ final class SolutionTest extends \PHPUnit\Framework\TestCase
{
$obj = new Solution();
self::assertEquals(0, $obj->getId());
self::assertEquals(0, $obj->id);
self::assertEquals('', $obj->title);
self::assertEquals('', $obj->description);
self::assertEquals('', $obj->descriptionRaw);