diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 4305f9c..e691e92 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -91,7 +91,7 @@ final class BackendController extends Controller ->where('parent', null) ->where('app', $app) ->where('name/language', $response->header->l11n->language) - ->execute(); + ->executeGetArray(); $view->data['categories'] = $categories; @@ -104,12 +104,12 @@ final class BackendController extends Controller ->where('tags/title/language', $response->header->l11n->language) ->limit(25) ->sort('createdAt', OrderType::DESC) - ->execute(); + ->executeGetArray(); $view->data['docs'] = $documents; /** @var \Modules\Knowledgebase\Models\WikiApp[] $apps */ - $apps = WikiAppMapper::getAll()->execute(); + $apps = WikiAppMapper::getAll()->executeGetArray(); $view->data['apps'] = $apps; return $view; @@ -135,7 +135,7 @@ final class BackendController extends Controller $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response); /** @var \Modules\Knowledgebase\Models\WikiApp[] $list */ - $list = WikiAppMapper::getAll()->execute(); + $list = WikiAppMapper::getAll()->executeGetArray(); $view->data['apps'] = $list; return $view; @@ -213,12 +213,12 @@ final class BackendController extends Controller $list = WikiCategoryMapper::getAll() ->with('name') ->where('name/language', $response->header->l11n->language) - ->execute(); + ->executeGetArray(); $view->data['categories'] = $list; /** @var \Modules\Knowledgebase\Models\WikiApp[] $apps */ - $apps = WikiAppMapper::getAll()->execute(); + $apps = WikiAppMapper::getAll()->executeGetArray(); $view->data['apps'] = $apps; return $view; @@ -257,7 +257,7 @@ final class BackendController extends Controller /** @var \phpOMS\Localization\BaseStringL11n[] $l11nValues */ $l11nValues = WikiCategoryL11nMapper::getAll() ->where('ref', $category->id) - ->execute(); + ->executeGetArray(); $view->data['l11nValues'] = $l11nValues; @@ -341,7 +341,7 @@ final class BackendController extends Controller ->where('app', $wikiId) ->where('parent', $categoryId === 0 ? null : $categoryId) ->where('name/language', $response->header->l11n->language) - ->execute(); + ->executeGetArray(); $view->data['categories'] = $categories; @@ -358,12 +358,12 @@ final class BackendController extends Controller ->where('language', $response->header->l11n->language) ->where('tags/title/language', $response->header->l11n->language) ->sort('createdAt', OrderType::DESC) - ->execute(); + ->executeGetArray(); $view->data['docs'] = $documents; /** @var \Modules\Knowledgebase\Models\WikiApp[] $apps */ - $apps = WikiAppMapper::getAll()->execute(); + $apps = WikiAppMapper::getAll()->executeGetArray(); $view->data['apps'] = $apps; return $view; @@ -416,7 +416,7 @@ final class BackendController extends Controller ->where('parent', $request->getDataInt('category')) ->where('app', $app) ->where('name/language', $response->header->l11n->language) - ->execute(); + ->executeGetArray(); $view->data['categories'] = $categories; $view->data['document'] = $document; diff --git a/Controller/SearchController.php b/Controller/SearchController.php index 721a370..0adeef6 100644 --- a/Controller/SearchController.php +++ b/Controller/SearchController.php @@ -55,7 +55,7 @@ final class SearchController extends Controller ->where('tags/title/language', $response->header->l11n->language) ->sort('createdAt', OrderType::DESC) ->limit(8) - ->execute(); + ->executeGetArray(); $results = []; foreach ($docs as $doc) { diff --git a/tests/Models/WikiCategoryMapperTest.php b/tests/Models/WikiCategoryMapperTest.php index ffec574..aab2b9e 100755 --- a/tests/Models/WikiCategoryMapperTest.php +++ b/tests/Models/WikiCategoryMapperTest.php @@ -50,7 +50,7 @@ final class WikiCategoryMapperTest extends \PHPUnit\Framework\TestCase $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())); + self::assertGreaterThan(0, \count(WikiCategoryMapper::getAll()->where('app', 1)->executeGetArray())); } #[\PHPUnit\Framework\Attributes\Group('module')] @@ -81,7 +81,7 @@ final class WikiCategoryMapperTest extends \PHPUnit\Framework\TestCase ->where('parent', 1) ->where('app', 1) ->where('name/language', ISO639x1Enum::_EN) - ->execute() + ->executeGetArray() ) ); } diff --git a/tests/Models/WikiDocMapperTest.php b/tests/Models/WikiDocMapperTest.php index 15e6868..86a8c4f 100755 --- a/tests/Models/WikiDocMapperTest.php +++ b/tests/Models/WikiDocMapperTest.php @@ -54,7 +54,7 @@ final class WikiDocMapperTest extends \PHPUnit\Framework\TestCase self::assertGreaterThan(0, \count( - WikiDocMapper::getAll()->where('app', 1)->sort('id', OrderType::DESC)->execute() + WikiDocMapper::getAll()->where('app', 1)->sort('id', OrderType::DESC)->executeGetArray() ) ); }