diff --git a/Admin/Installer.php b/Admin/Installer.php index c80e909..b942e99 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -55,7 +55,7 @@ final class Installer extends InstallerAbstract WikiAppMapper::create()->execute($app); $category = new WikiCategory(); - $category->app = new NullWikiApp($app->getId()); + $category->app = new NullWikiApp($app->id); $category->setL11n('Default'); WikiCategoryMapper::create()->execute($category); diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 0f40e73..8ce8303 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -124,21 +124,21 @@ final class ApiController extends Controller foreach ($uploaded as $media) { $this->createModelRelation( $request->header->account, - $doc->getId(), - $media->getId(), + $doc->id, + $media->id, WikiDocMapper::class, 'media', '', $request->getOrigin() ); - $accountPath = '/Accounts/' . $account->getId() . ' ' . $account->login - . '/Knowledgebase/' . ($doc->category?->getId() ?? '0') - . '/' . $doc->getId(); + $accountPath = '/Accounts/' . $account->id . ' ' . $account->login + . '/Knowledgebase/' . ($doc->category?->id ?? '0') + . '/' . $doc->id; $ref = new Reference(); $ref->name = $media->name; - $ref->source = new NullMedia($media->getId()); + $ref->source = new NullMedia($media->id); $ref->createdBy = new NullAccount($request->header->account); $ref->setVirtualPath($accountPath); @@ -148,14 +148,14 @@ final class ApiController extends Controller $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection( $accountPath, $request->header->account, - __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->getId() . '/Knowledgebase/' . ($doc->category?->getId() ?? '0') . '/' . $doc->getId() + __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->id . '/Knowledgebase/' . ($doc->category?->id ?? '0') . '/' . $doc->id ); } $this->createModelRelation( $request->header->account, - $collection->getId(), - $ref->getId(), + $collection->id, + $ref->id, CollectionMapper::class, 'sources', '', @@ -172,8 +172,8 @@ final class ApiController extends Controller $media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute(); $this->createModelRelation( $request->header->account, - $doc->getId(), - $media->getId(), + $doc->id, + $media->id, WikiDocMapper::class, 'media', '', @@ -182,7 +182,7 @@ final class ApiController extends Controller $ref = new Reference(); $ref->name = $media->name; - $ref->source = new NullMedia($media->getId()); + $ref->source = new NullMedia($media->id); $ref->createdBy = new NullAccount($request->header->account); $ref->setVirtualPath($path); @@ -198,8 +198,8 @@ final class ApiController extends Controller $this->createModelRelation( $request->header->account, - $collection->getId(), - $ref->getId(), + $collection->id, + $ref->id, CollectionMapper::class, 'sources', '', @@ -221,8 +221,8 @@ final class ApiController extends Controller private function createWikiDir(WikiDoc $doc) : string { return '/Modules/Knowledgebase/' - . ($doc->category?->getId() ?? '0') . '/' - . $doc->getId(); + . ($doc->category?->id ?? '0') . '/' + . $doc->id; } /** diff --git a/Controller/BackendController.php b/Controller/BackendController.php index cc073c1..179b274 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -319,7 +319,7 @@ final class BackendController extends Controller $accountId = $request->header->account; if (!$this->app->accountManager->get($accountId)->hasPermission( - PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::WIKI, $document->getId()) + PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::WIKI, $document->id) ) { $view->setTemplate('/Web/Backend/Error/403_inline'); $response->header->status = RequestStatusCode::R_403; @@ -340,7 +340,7 @@ final class BackendController extends Controller $view->setData('categories', $categories); $view->setData('document', $document); $view->addData('editable', $this->app->accountManager->get($accountId)->hasPermission( - PermissionType::MODIFY, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::WIKI, $document->getId()) + PermissionType::MODIFY, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::WIKI, $document->id) ); return $view; diff --git a/Models/WikiApp.php b/Models/WikiApp.php index 4bb025c..6ce4c5f 100755 --- a/Models/WikiApp.php +++ b/Models/WikiApp.php @@ -30,7 +30,7 @@ class WikiApp implements \JsonSerializable * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; /** * Unit diff --git a/Models/WikiCategory.php b/Models/WikiCategory.php index e4f1540..dd7f912 100755 --- a/Models/WikiCategory.php +++ b/Models/WikiCategory.php @@ -33,7 +33,7 @@ class WikiCategory implements \JsonSerializable * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; /** * App id. diff --git a/Models/WikiDoc.php b/Models/WikiDoc.php index 132b172..34ae94f 100755 --- a/Models/WikiDoc.php +++ b/Models/WikiDoc.php @@ -36,7 +36,7 @@ class WikiDoc implements \JsonSerializable * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; /** * Version. @@ -70,7 +70,7 @@ class WikiDoc implements \JsonSerializable * @var int * @since 1.0.0 */ - private int $status = WikiStatus::ACTIVE; + public int $status = WikiStatus::ACTIVE; /** * Document content. @@ -102,7 +102,7 @@ class WikiDoc implements \JsonSerializable * @var string * @since 1.0.0 */ - private string $language = ISO639x1Enum::_EN; + public string $language = ISO639x1Enum::_EN; /** * Tags. diff --git a/Models/WikiDocHistory.php b/Models/WikiDocHistory.php index dbc138e..a901a41 100755 --- a/Models/WikiDocHistory.php +++ b/Models/WikiDocHistory.php @@ -34,7 +34,7 @@ class WikiDocHistory implements \JsonSerializable * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; /** * Article ID. @@ -98,7 +98,7 @@ class WikiDocHistory implements \JsonSerializable * @var string * @since 1.0.0 */ - private string $language = ISO639x1Enum::_EN; + public string $language = ISO639x1Enum::_EN; /** * Constructor. @@ -123,7 +123,7 @@ class WikiDocHistory implements \JsonSerializable public static function createFromDoc(WikiDoc $doc) : self { $hist = new self(); - $hist->article = $doc->getId(); + $hist->article = $doc->id; $hist->createdBy = $doc->createdBy; $hist->name = $doc->name; $hist->doc = $doc->doc; diff --git a/Theme/Backend/wiki-category-list.tpl.php b/Theme/Backend/wiki-category-list.tpl.php index 41bf849..f4f7555 100755 --- a/Theme/Backend/wiki-category-list.tpl.php +++ b/Theme/Backend/wiki-category-list.tpl.php @@ -34,9 +34,9 @@ echo $this->getData('nav')->render(); getHtml('Parent'); ?> $value) : - $url = UriFactory::build('{/base}/admin/account/settings?{?}&id=' . $value->getId()); ?> + $url = UriFactory::build('{/base}/admin/account/settings?{?}&id=' . $value->id); ?> - getId(); ?> + id; ?> printHtml($value->getL11n()); ?> printHtml($value->parent !== null ? $value->parent->getL11n() : ''); ?> diff --git a/Theme/Backend/wiki-dashboard.tpl.php b/Theme/Backend/wiki-dashboard.tpl.php index b288931..729c1da 100755 --- a/Theme/Backend/wiki-dashboard.tpl.php +++ b/Theme/Backend/wiki-dashboard.tpl.php @@ -29,7 +29,7 @@ echo $this->getData('nav')->render(); ?>
- getId()); ?> + id); ?>
@@ -74,7 +74,7 @@ echo $this->getData('nav')->render(); ?> diff --git a/Theme/Backend/wiki-doc-create.tpl.php b/Theme/Backend/wiki-doc-create.tpl.php index 48cea3e..64d45b8 100755 --- a/Theme/Backend/wiki-doc-create.tpl.php +++ b/Theme/Backend/wiki-doc-create.tpl.php @@ -18,7 +18,7 @@ use phpOMS\Uri\UriFactory; /** @var \Modules\Knowledgebase\Models\WikiDoc $wiki */ $wiki = $this->getData('doc') ?? new NullWikiDoc(); -$isNewDoc = $wiki instanceof NullWikiDoc; +$isNewDoc = $wiki->id === 0; $languages = \phpOMS\Localization\ISO639Enum::getConstants(); /** @var \phpOMS\Views\View $this */ diff --git a/Theme/Backend/wiki-doc-single.tpl.php b/Theme/Backend/wiki-doc-single.tpl.php index 7746bc7..2da68aa 100755 --- a/Theme/Backend/wiki-doc-single.tpl.php +++ b/Theme/Backend/wiki-doc-single.tpl.php @@ -50,12 +50,12 @@ echo $this->getData('nav')->render(); getMedia(); foreach ($files as $file) : ?> - name; ?> + name; ?>
@@ -70,7 +70,7 @@ echo $this->getData('nav')->render(); diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index e2ec7c8..5613c46 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -107,7 +107,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $request->setData('name', 'Test App'); $this->module->apiWikiAppCreate($request, $response); - self::assertGreaterThan(0, $aId = $response->get('')['response']->getId()); + self::assertGreaterThan(0, $aId = $response->get('')['response']->id); //read $response = new HttpResponse(); @@ -162,7 +162,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $request->setData('name', 'Test Category'); $this->module->apiWikiCategoryCreate($request, $response); - self::assertGreaterThan(0, $cId = $response->get('')['response']->getId()); + self::assertGreaterThan(0, $cId = $response->get('')['response']->id); //read $response = new HttpResponse(); @@ -216,7 +216,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $request->setData('name', 'New Test Category'); $this->module->apiWikiCategoryL11nCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->getId()); + self::assertGreaterThan(0, $response->get('')['response']->id); } /** @@ -267,7 +267,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $request->setData('media', \json_encode([1])); $this->module->apiWikiDocCreate($request, $response); - self::assertGreaterThan(0, $cId = $response->get('')['response']->getId()); + self::assertGreaterThan(0, $cId = $response->get('')['response']->id); //read $response = new HttpResponse(); diff --git a/tests/Models/NullWikiAppTest.php b/tests/Models/NullWikiAppTest.php index e06c23b..73d5220 100755 --- a/tests/Models/NullWikiAppTest.php +++ b/tests/Models/NullWikiAppTest.php @@ -37,6 +37,6 @@ final class NullWikiAppTest extends \PHPUnit\Framework\TestCase public function testId() : void { $null = new NullWikiApp(2); - self::assertEquals(2, $null->getId()); + self::assertEquals(2, $null->id); } } diff --git a/tests/Models/NullWikiCategoryTest.php b/tests/Models/NullWikiCategoryTest.php index 938caee..dee5e82 100755 --- a/tests/Models/NullWikiCategoryTest.php +++ b/tests/Models/NullWikiCategoryTest.php @@ -37,6 +37,6 @@ final class NullWikiCategoryTest extends \PHPUnit\Framework\TestCase public function testId() : void { $null = new NullWikiCategory(2); - self::assertEquals(2, $null->getId()); + self::assertEquals(2, $null->id); } } diff --git a/tests/Models/NullWikiDocTest.php b/tests/Models/NullWikiDocTest.php index 9082e2f..5349b4d 100755 --- a/tests/Models/NullWikiDocTest.php +++ b/tests/Models/NullWikiDocTest.php @@ -37,6 +37,6 @@ final class NullWikiDocTest extends \PHPUnit\Framework\TestCase public function testId() : void { $null = new NullWikiDoc(2); - self::assertEquals(2, $null->getId()); + self::assertEquals(2, $null->id); } } diff --git a/tests/Models/WikiAppMapperTest.php b/tests/Models/WikiAppMapperTest.php index aec1996..963948a 100755 --- a/tests/Models/WikiAppMapperTest.php +++ b/tests/Models/WikiAppMapperTest.php @@ -36,10 +36,10 @@ final class WikiAppMapperTest extends \PHPUnit\Framework\TestCase $app->name = 'Test Category'; $id = WikiAppMapper::create()->execute($app); - self::assertGreaterThan(0, $app->getId()); - self::assertEquals($id, $app->getId()); + self::assertGreaterThan(0, $app->id); + self::assertEquals($id, $app->id); - $appR = WikiAppMapper::get()->where('id', $app->getId())->execute(); + $appR = WikiAppMapper::get()->where('id', $app->id)->execute(); self::assertEquals($app->name, $appR->name); } } diff --git a/tests/Models/WikiAppTest.php b/tests/Models/WikiAppTest.php index 6944564..b221c0a 100755 --- a/tests/Models/WikiAppTest.php +++ b/tests/Models/WikiAppTest.php @@ -40,7 +40,7 @@ final class WikiAppTest extends \PHPUnit\Framework\TestCase */ public function testDefault() : void { - self::assertEquals(0, $this->app->getId()); + self::assertEquals(0, $this->app->id); self::assertEquals('', $this->app->name); } diff --git a/tests/Models/WikiCategoryMapperTest.php b/tests/Models/WikiCategoryMapperTest.php index af6c84f..7e86153 100755 --- a/tests/Models/WikiCategoryMapperTest.php +++ b/tests/Models/WikiCategoryMapperTest.php @@ -47,10 +47,10 @@ final class WikiCategoryMapperTest extends \PHPUnit\Framework\TestCase $this->category->setL11n('Test Category'); $id = WikiCategoryMapper::create()->execute($this->category); - self::assertGreaterThan(0, $this->category->getId()); - self::assertEquals($id, $this->category->getId()); + self::assertGreaterThan(0, $this->category->id); + self::assertEquals($id, $this->category->id); - $categoryR = WikiCategoryMapper::get()->with('name')->where('id', $this->category->getId())->where('name/language', ISO639x1Enum::_EN)->execute(); + $categoryR = WikiCategoryMapper::get()->with('name')->where('id', $this->category->id)->where('name/language', ISO639x1Enum::_EN)->execute(); self::assertEquals($this->category->getL11n(), $categoryR->getL11n()); self::assertGreaterThan(0, \count(WikiCategoryMapper::getAll()->where('app', 1)->execute())); @@ -68,17 +68,17 @@ final class WikiCategoryMapperTest extends \PHPUnit\Framework\TestCase $this->category->parent = new NullWikiCategory(1); $id = WikiCategoryMapper::create()->execute($this->category); - self::assertGreaterThan(0, $this->category->getId()); - self::assertEquals($id, $this->category->getId()); + self::assertGreaterThan(0, $this->category->id); + self::assertEquals($id, $this->category->id); $categoryR = WikiCategoryMapper::get() ->with('name') - ->where('id', $this->category->getId()) + ->where('id', $this->category->id) ->where('name/language', ISO639x1Enum::_EN) ->execute(); self::assertEquals($this->category->getL11n(), $categoryR->getL11n()); - self::assertEquals($this->category->parent->getId(), $categoryR->parent->getId()); + self::assertEquals($this->category->parent->id, $categoryR->parent->id); self::assertGreaterThan(0, \count( diff --git a/tests/Models/WikiCategoryTest.php b/tests/Models/WikiCategoryTest.php index 185b506..6182a44 100755 --- a/tests/Models/WikiCategoryTest.php +++ b/tests/Models/WikiCategoryTest.php @@ -43,11 +43,11 @@ final class WikiCategoryTest extends \PHPUnit\Framework\TestCase */ public function testDefault() : void { - self::assertEquals(0, $this->category->getId()); - self::assertEquals(0, $this->category->app->getId()); + self::assertEquals(0, $this->category->id); + self::assertEquals(0, $this->category->app->id); self::assertEquals('', $this->category->getL11n()); self::assertEquals('/', $this->category->virtualPath); - self::assertEquals(0, $this->category->parent->getId()); + self::assertEquals(0, $this->category->parent->id); } /** @@ -58,7 +58,7 @@ final class WikiCategoryTest extends \PHPUnit\Framework\TestCase public function testAppInputOutput() : void { $this->category->app = new NullWikiApp(2); - self::assertEquals(2, $this->category->app->getId()); + self::assertEquals(2, $this->category->app->id); } /** @@ -94,7 +94,7 @@ final class WikiCategoryTest extends \PHPUnit\Framework\TestCase public function testParentInputOutput() : void { $this->category->parent = new NullWikiCategory(2); - self::assertEquals(2, $this->category->parent->getId()); + self::assertEquals(2, $this->category->parent->id); } /** diff --git a/tests/Models/WikiDocMapperTest.php b/tests/Models/WikiDocMapperTest.php index 6fdcba6..27b735c 100755 --- a/tests/Models/WikiDocMapperTest.php +++ b/tests/Models/WikiDocMapperTest.php @@ -45,15 +45,15 @@ final class WikiDocMapperTest extends \PHPUnit\Framework\TestCase $doc->createdBy = new NullAccount(1); $id = WikiDocMapper::create()->execute($doc); - self::assertGreaterThan(0, $doc->getId()); - self::assertEquals($id, $doc->getId()); + self::assertGreaterThan(0, $doc->id); + self::assertEquals($id, $doc->id); - $docR = WikiDocMapper::get()->where('id', $doc->getId())->execute(); + $docR = WikiDocMapper::get()->where('id', $doc->id)->execute(); self::assertEquals($doc->name, $docR->name); self::assertEquals($doc->doc, $docR->doc); self::assertEquals($doc->getStatus(), $docR->getStatus()); self::assertEquals($doc->getLanguage(), $docR->getLanguage()); - self::assertEquals($doc->category->getId(), $docR->category->getId()); + self::assertEquals($doc->category->id, $docR->category->id); self::assertGreaterThan(0, \count( diff --git a/tests/Models/WikiDocTest.php b/tests/Models/WikiDocTest.php index e0e7b76..ca60082 100755 --- a/tests/Models/WikiDocTest.php +++ b/tests/Models/WikiDocTest.php @@ -46,7 +46,7 @@ final class WikiDocTest extends \PHPUnit\Framework\TestCase */ public function testDefault() : void { - self::assertEquals(0, $this->doc->getId()); + self::assertEquals(0, $this->doc->id); self::assertNull($this->doc->app); self::assertEquals('', $this->doc->name); self::assertEquals('', $this->doc->doc); @@ -65,7 +65,7 @@ final class WikiDocTest extends \PHPUnit\Framework\TestCase public function tesAppInputOutput() : void { $this->doc->app = new NullWikiApp(2); - self::assertEquals(2, $this->doc->app->getId()); + self::assertEquals(2, $this->doc->app->id); } /** @@ -120,7 +120,7 @@ final class WikiDocTest extends \PHPUnit\Framework\TestCase public function testCategoryInputOutput() : void { $this->doc->category = new NullWikiCategory(3); - self::assertEquals(3, $this->doc->category->getId()); + self::assertEquals(3, $this->doc->category->id); } /**