From 4f54b27df4167fa9109aa8d856165bbe71b61414 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 6 May 2023 11:42:06 +0000 Subject: [PATCH] make id public, organigram impl. media password/encryption, settings bug fix, Money->FloatInt change, ... --- Models/Category.php | 2 +- Models/Cause.php | 2 +- Models/Department.php | 2 +- Models/Process.php | 2 +- Models/Project.php | 2 +- Models/Risk.php | 2 +- Models/RiskObject.php | 2 +- Models/Solution.php | 2 +- Theme/Backend/category-list.tpl.php | 4 ++-- Theme/Backend/cause-list.tpl.php | 4 ++-- Theme/Backend/cockpit.tpl.php | 4 ++-- Theme/Backend/department-list.tpl.php | 4 ++-- Theme/Backend/department-single.tpl.php | 24 ++++++++++----------- Theme/Backend/process-list.tpl.php | 4 ++-- Theme/Backend/project-list.tpl.php | 4 ++-- Theme/Backend/risk-list.tpl.php | 4 ++-- Theme/Backend/solution-list.tpl.php | 4 ++-- Theme/Backend/unit-list.tpl.php | 4 ++-- Theme/Backend/unit-single.tpl.php | 28 ++++++++++++------------- tests/Models/CategoryMapperTest.php | 2 +- tests/Models/CategoryTest.php | 2 +- tests/Models/CauseMapperTest.php | 4 ++-- tests/Models/CauseTest.php | 2 +- tests/Models/DepartmentMapperTest.php | 4 ++-- tests/Models/DepartmentTest.php | 2 +- tests/Models/NullCategoryTest.php | 2 +- tests/Models/NullCauseTest.php | 2 +- tests/Models/NullDepartmentTest.php | 2 +- tests/Models/NullProcessTest.php | 2 +- tests/Models/NullProjectTest.php | 2 +- tests/Models/NullRiskObjectTest.php | 2 +- tests/Models/NullRiskTest.php | 2 +- tests/Models/NullSolutionTest.php | 2 +- tests/Models/ProcessMapperTest.php | 6 +++--- tests/Models/ProcessTest.php | 2 +- tests/Models/ProjectMapperTest.php | 4 ++-- tests/Models/ProjectTest.php | 2 +- tests/Models/RiskMapperTest.php | 12 +++++------ tests/Models/RiskObjectMapperTest.php | 2 +- tests/Models/RiskObjectTest.php | 2 +- tests/Models/RiskTest.php | 2 +- tests/Models/SolutionMapperTest.php | 6 +++--- tests/Models/SolutionTest.php | 2 +- 43 files changed, 88 insertions(+), 88 deletions(-) diff --git a/Models/Category.php b/Models/Category.php index 2d4a0a3..1522c59 100755 --- a/Models/Category.php +++ b/Models/Category.php @@ -30,7 +30,7 @@ class Category * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; /** * Title. diff --git a/Models/Cause.php b/Models/Cause.php index 79c6175..0c072e8 100755 --- a/Models/Cause.php +++ b/Models/Cause.php @@ -30,7 +30,7 @@ class Cause * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; public string $title = ''; diff --git a/Models/Department.php b/Models/Department.php index cb2f1a1..f096aa2 100755 --- a/Models/Department.php +++ b/Models/Department.php @@ -32,7 +32,7 @@ class Department * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; public ?OrgDepartment $department = null; diff --git a/Models/Process.php b/Models/Process.php index 8dc3bd9..3817584 100755 --- a/Models/Process.php +++ b/Models/Process.php @@ -32,7 +32,7 @@ class Process * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; public string $title = ''; diff --git a/Models/Project.php b/Models/Project.php index 78c56ff..4949393 100755 --- a/Models/Project.php +++ b/Models/Project.php @@ -32,7 +32,7 @@ class Project * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; public ?PMProject $project = null; diff --git a/Models/Risk.php b/Models/Risk.php index df85bbe..2d91ecc 100755 --- a/Models/Risk.php +++ b/Models/Risk.php @@ -33,7 +33,7 @@ class Risk * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; /** * Name. diff --git a/Models/RiskObject.php b/Models/RiskObject.php index 7ebccb7..22d88a9 100755 --- a/Models/RiskObject.php +++ b/Models/RiskObject.php @@ -30,7 +30,7 @@ class RiskObject * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; public string $title = ''; diff --git a/Models/Solution.php b/Models/Solution.php index 440478b..e4939f1 100755 --- a/Models/Solution.php +++ b/Models/Solution.php @@ -30,7 +30,7 @@ class Solution * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; public string $title = ''; diff --git a/Theme/Backend/category-list.tpl.php b/Theme/Backend/category-list.tpl.php index d53bf34..c87e2c4 100755 --- a/Theme/Backend/category-list.tpl.php +++ b/Theme/Backend/category-list.tpl.php @@ -29,9 +29,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/category/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/category/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getTitle()); ?> diff --git a/Theme/Backend/cause-list.tpl.php b/Theme/Backend/cause-list.tpl.php index 379825e..85b5d32 100755 --- a/Theme/Backend/cause-list.tpl.php +++ b/Theme/Backend/cause-list.tpl.php @@ -30,9 +30,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getTitle()); ?> printHtml($value->getRisk()->getName()); ?> diff --git a/Theme/Backend/cockpit.tpl.php b/Theme/Backend/cockpit.tpl.php index 53b31fb..08e5d47 100755 --- a/Theme/Backend/cockpit.tpl.php +++ b/Theme/Backend/cockpit.tpl.php @@ -43,9 +43,9 @@ echo $this->getData('nav')->render(); ?> $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); ?> - getId(); ?> + id; ?> printHtml($value->name); ?> diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php index a1e67c9..d3718ef 100755 --- a/Theme/Backend/department-list.tpl.php +++ b/Theme/Backend/department-list.tpl.php @@ -29,9 +29,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/department/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/department/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getDepartment()->getName()); ?> diff --git a/Theme/Backend/department-single.tpl.php b/Theme/Backend/department-single.tpl.php index 209c4a3..fd10655 100755 --- a/Theme/Backend/department-single.tpl.php +++ b/Theme/Backend/department-single.tpl.php @@ -112,9 +112,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->name); ?> printHtml(\count($value->getCauses())); ?> printHtml(\count($value->getSolutions())); ?> @@ -143,9 +143,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/category/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/category/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getTitle()); ?> @@ -171,9 +171,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/project/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/project/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getProject()->getName()); ?> @@ -199,9 +199,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/process/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/process/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getTitle()); ?> @@ -228,9 +228,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getTitle()); ?> printHtml($value->getRisk()->getName()); ?> @@ -259,9 +259,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/solution/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/solution/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getTitle()); ?> printHtml($value->getRisk()->getName()); ?> printHtml($value->getCause()->getTitle()); ?> diff --git a/Theme/Backend/process-list.tpl.php b/Theme/Backend/process-list.tpl.php index bee360d..bf1826d 100755 --- a/Theme/Backend/process-list.tpl.php +++ b/Theme/Backend/process-list.tpl.php @@ -29,9 +29,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/process/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/process/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getTitle()); ?> diff --git a/Theme/Backend/project-list.tpl.php b/Theme/Backend/project-list.tpl.php index d4fa0a1..c3f5f6e 100755 --- a/Theme/Backend/project-list.tpl.php +++ b/Theme/Backend/project-list.tpl.php @@ -29,9 +29,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/project/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/project/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getProject()->getName()); ?> diff --git a/Theme/Backend/risk-list.tpl.php b/Theme/Backend/risk-list.tpl.php index 5a763d2..0ab7b04 100755 --- a/Theme/Backend/risk-list.tpl.php +++ b/Theme/Backend/risk-list.tpl.php @@ -32,9 +32,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/risk/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/risk/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->name); ?> printHtml(\count($value->getCauses())); ?> printHtml(\count($value->getSolutions())); ?> diff --git a/Theme/Backend/solution-list.tpl.php b/Theme/Backend/solution-list.tpl.php index 3368b78..bd959f5 100755 --- a/Theme/Backend/solution-list.tpl.php +++ b/Theme/Backend/solution-list.tpl.php @@ -32,9 +32,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/solution/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/solution/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getTitle()); ?> printHtml($value->getRisk()->getName()); ?> printHtml($value->getCause()->getTitle()); ?> diff --git a/Theme/Backend/unit-list.tpl.php b/Theme/Backend/unit-list.tpl.php index 70a0a01..de330d9 100755 --- a/Theme/Backend/unit-list.tpl.php +++ b/Theme/Backend/unit-list.tpl.php @@ -29,9 +29,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/unit/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/unit/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->name); ?> diff --git a/Theme/Backend/unit-single.tpl.php b/Theme/Backend/unit-single.tpl.php index a938675..1113497 100755 --- a/Theme/Backend/unit-single.tpl.php +++ b/Theme/Backend/unit-single.tpl.php @@ -113,9 +113,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->name); ?> printHtml(\count($value->getCauses())); ?> printHtml(\count($value->getSolutions())); ?> @@ -144,9 +144,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/department/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/department/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getDepartment()->getName()); ?> @@ -172,9 +172,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/category/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/category/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getTitle()); ?> @@ -200,9 +200,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/project/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/project/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getProject()->getName()); ?> @@ -228,9 +228,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/process/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/process/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getTitle()); ?> @@ -257,9 +257,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/cause/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getTitle()); ?> printHtml($value->getRisk()->getName()); ?> @@ -288,9 +288,9 @@ echo $this->getData('nav')->render(); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('riskmanagement/solution/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('riskmanagement/solution/single?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getTitle()); ?> printHtml($value->getRisk()->getName()); ?> printHtml($value->getCause()->getTitle()); ?> diff --git a/tests/Models/CategoryMapperTest.php b/tests/Models/CategoryMapperTest.php index 0db7210..b5c5902 100755 --- a/tests/Models/CategoryMapperTest.php +++ b/tests/Models/CategoryMapperTest.php @@ -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); diff --git a/tests/Models/CategoryTest.php b/tests/Models/CategoryTest.php index d953c2e..4bb07e2 100755 --- a/tests/Models/CategoryTest.php +++ b/tests/Models/CategoryTest.php @@ -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); diff --git a/tests/Models/CauseMapperTest.php b/tests/Models/CauseMapperTest.php index 931f9dd..fb5fe5b 100755 --- a/tests/Models/CauseMapperTest.php +++ b/tests/Models/CauseMapperTest.php @@ -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); } diff --git a/tests/Models/CauseTest.php b/tests/Models/CauseTest.php index b17b4a8..0554708 100755 --- a/tests/Models/CauseTest.php +++ b/tests/Models/CauseTest.php @@ -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); diff --git a/tests/Models/DepartmentMapperTest.php b/tests/Models/DepartmentMapperTest.php index 2a25feb..9b10022 100755 --- a/tests/Models/DepartmentMapperTest.php +++ b/tests/Models/DepartmentMapperTest.php @@ -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); } diff --git a/tests/Models/DepartmentTest.php b/tests/Models/DepartmentTest.php index 5301dd2..c76833e 100755 --- a/tests/Models/DepartmentTest.php +++ b/tests/Models/DepartmentTest.php @@ -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); diff --git a/tests/Models/NullCategoryTest.php b/tests/Models/NullCategoryTest.php index c5f2a9f..ad64563 100755 --- a/tests/Models/NullCategoryTest.php +++ b/tests/Models/NullCategoryTest.php @@ -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); } } diff --git a/tests/Models/NullCauseTest.php b/tests/Models/NullCauseTest.php index bf3a04e..02c8767 100755 --- a/tests/Models/NullCauseTest.php +++ b/tests/Models/NullCauseTest.php @@ -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); } } diff --git a/tests/Models/NullDepartmentTest.php b/tests/Models/NullDepartmentTest.php index 027a88e..7e45370 100755 --- a/tests/Models/NullDepartmentTest.php +++ b/tests/Models/NullDepartmentTest.php @@ -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); } } diff --git a/tests/Models/NullProcessTest.php b/tests/Models/NullProcessTest.php index da8d482..c446b8d 100755 --- a/tests/Models/NullProcessTest.php +++ b/tests/Models/NullProcessTest.php @@ -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); } } diff --git a/tests/Models/NullProjectTest.php b/tests/Models/NullProjectTest.php index 3eee5d4..982cdbf 100755 --- a/tests/Models/NullProjectTest.php +++ b/tests/Models/NullProjectTest.php @@ -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); } } diff --git a/tests/Models/NullRiskObjectTest.php b/tests/Models/NullRiskObjectTest.php index 5c61f92..b0cb624 100755 --- a/tests/Models/NullRiskObjectTest.php +++ b/tests/Models/NullRiskObjectTest.php @@ -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); } } diff --git a/tests/Models/NullRiskTest.php b/tests/Models/NullRiskTest.php index 9133540..33fb3bb 100755 --- a/tests/Models/NullRiskTest.php +++ b/tests/Models/NullRiskTest.php @@ -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); } } diff --git a/tests/Models/NullSolutionTest.php b/tests/Models/NullSolutionTest.php index f8e5de1..f84e219 100755 --- a/tests/Models/NullSolutionTest.php +++ b/tests/Models/NullSolutionTest.php @@ -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); } } diff --git a/tests/Models/ProcessMapperTest.php b/tests/Models/ProcessMapperTest.php index 9a20f32..b4747a9 100755 --- a/tests/Models/ProcessMapperTest.php +++ b/tests/Models/ProcessMapperTest.php @@ -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); } } diff --git a/tests/Models/ProcessTest.php b/tests/Models/ProcessTest.php index 5b30cba..1867c95 100755 --- a/tests/Models/ProcessTest.php +++ b/tests/Models/ProcessTest.php @@ -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); diff --git a/tests/Models/ProjectMapperTest.php b/tests/Models/ProjectMapperTest.php index 992ae0e..6ef4623 100755 --- a/tests/Models/ProjectMapperTest.php +++ b/tests/Models/ProjectMapperTest.php @@ -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); } diff --git a/tests/Models/ProjectTest.php b/tests/Models/ProjectTest.php index e211ba9..d8a66b4 100755 --- a/tests/Models/ProjectTest.php +++ b/tests/Models/ProjectTest.php @@ -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); diff --git a/tests/Models/RiskMapperTest.php b/tests/Models/RiskMapperTest.php index d72ab4e..99ec807 100755 --- a/tests/Models/RiskMapperTest.php +++ b/tests/Models/RiskMapperTest.php @@ -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); diff --git a/tests/Models/RiskObjectMapperTest.php b/tests/Models/RiskObjectMapperTest.php index e3eb55d..30e0041 100755 --- a/tests/Models/RiskObjectMapperTest.php +++ b/tests/Models/RiskObjectMapperTest.php @@ -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); diff --git a/tests/Models/RiskObjectTest.php b/tests/Models/RiskObjectTest.php index bfb8632..6de8fab 100755 --- a/tests/Models/RiskObjectTest.php +++ b/tests/Models/RiskObjectTest.php @@ -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); diff --git a/tests/Models/RiskTest.php b/tests/Models/RiskTest.php index 3591957..4ffc265 100755 --- a/tests/Models/RiskTest.php +++ b/tests/Models/RiskTest.php @@ -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); diff --git a/tests/Models/SolutionMapperTest.php b/tests/Models/SolutionMapperTest.php index d35349f..5370a59 100755 --- a/tests/Models/SolutionMapperTest.php +++ b/tests/Models/SolutionMapperTest.php @@ -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); } } diff --git a/tests/Models/SolutionTest.php b/tests/Models/SolutionTest.php index bb321a4..2412cd8 100755 --- a/tests/Models/SolutionTest.php +++ b/tests/Models/SolutionTest.php @@ -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);