diff --git a/Build/phpstan10.neon b/Build/phpstan10.neon index e3aecbf..b36e70c 100644 --- a/Build/phpstan10.neon +++ b/Build/phpstan10.neon @@ -6,9 +6,6 @@ parameters: - %currentWorkingDirectory%/Tests ignoreErrors: - - - message: '#Constant ORIGINAL_ROOT not found.#' - path: %currentWorkingDirectory%/Tests - message: '#Call to an undefined method B13\\Menus\\ContentObject\\.*ContentObject::setContentObjectRenderer\(\).#' path: %currentWorkingDirectory%/Classes/ContentObject/* diff --git a/Build/phpstan11.neon b/Build/phpstan11.neon index 53320a4..885e254 100644 --- a/Build/phpstan11.neon +++ b/Build/phpstan11.neon @@ -4,8 +4,3 @@ parameters: paths: - %currentWorkingDirectory%/Classes - %currentWorkingDirectory%/Tests - - ignoreErrors: - - - message: '#Constant ORIGINAL_ROOT not found.#' - path: %currentWorkingDirectory%/Tests diff --git a/Build/phpstan12.neon b/Build/phpstan12.neon index 565faf6..aa46a85 100644 --- a/Build/phpstan12.neon +++ b/Build/phpstan12.neon @@ -6,9 +6,6 @@ parameters: - %currentWorkingDirectory%/Tests ignoreErrors: - - - message: '#Constant ORIGINAL_ROOT not found.#' - path: %currentWorkingDirectory%/Tests - message: '#Call to an undefined static method TYPO3\\CMS\\Frontend\\ContentObject\\AbstractContentObject::__construct\(\).#' path: %currentWorkingDirectory%/Classes/ContentObject/* diff --git a/Build/testing-docker/docker-compose.yml b/Build/testing-docker/docker-compose.yml index 3ee9e1c..0208c5a 100644 --- a/Build/testing-docker/docker-compose.yml +++ b/Build/testing-docker/docker-compose.yml @@ -92,7 +92,7 @@ services: fi composer prepare-tests-10 && composer prepare-tests else - composer remove typo3/cms* --dev --no-progress --no-interaction && composer config --no-interaction --no-plugins allow-plugins.sbuerk/typo3-cmscomposerinstallers-testingframework-bridge true && composer require typo3/cms-install:12.*.*@dev typo3/cms-fluid-styled-content:12.*.*@dev sbuerk/typo3-cmscomposerinstallers-testingframework-bridge:^0.0.1 --dev -W --no-progress --no-interaction + composer require typo3/cms-install:^12.4 typo3/cms-fluid-styled-content:^12.4 --dev -W --no-progress --no-interaction composer prepare-tests fi " @@ -147,7 +147,7 @@ services: typo3DatabaseUsername: root typo3DatabasePassword: funcp typo3DatabaseHost: mariadb10 - working_dir: ${ROOT_DIR}/.Build + working_dir: ${ROOT_DIR} command: > /bin/sh -c " if [ ${SCRIPT_VERBOSE} -eq 1 ]; then @@ -161,13 +161,13 @@ services: php -v | grep '^PHP'; if [ ${PHP_XDEBUG_ON} -eq 0 ]; then export XDEBUG_MODE=\"off\" - bin/phpunit -c Web/typo3conf/ext/menus/Build/phpunit/FunctionalTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE}; + .Build/bin/phpunit -c Build/phpunit/FunctionalTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE}; else DOCKER_HOST=`route -n | awk '/^0.0.0.0/ { print $$2 }'` export XDEBUG_MODE=\"debug,develop\" \ XDEBUG_TRIGGER=\"foo\" \ XDEBUG_CONFIG=\"client_port=${PHP_XDEBUG_PORT} client_host=$${DOCKER_HOST}\" - bin/phpunit -c Web/typo3conf/ext/menus/Build/phpunit/FunctionalTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE}; + .Build/bin/phpunit -c Build/phpunit/FunctionalTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE}; fi " lint: @@ -213,7 +213,7 @@ services: - ${HOST_HOME}:${HOST_HOME} - /etc/passwd:/etc/passwd:ro - /etc/group:/etc/group:ro - working_dir: ${ROOT_DIR}/.Build + working_dir: ${ROOT_DIR} command: > /bin/sh -c " if [ ${SCRIPT_VERBOSE} -eq 1 ]; then @@ -222,12 +222,12 @@ services: php -v | grep '^PHP'; if [ ${PHP_XDEBUG_ON} -eq 0 ]; then XDEBUG_MODE=\"off\" \ - bin/phpunit -c Web/typo3conf/ext/menus/Build/phpunit/UnitTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE}; + .Build/bin/phpunit -c Build/phpunit/UnitTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE}; else DOCKER_HOST=`route -n | awk '/^0.0.0.0/ { print $$2 }'` XDEBUG_MODE=\"debug,develop\" \ XDEBUG_TRIGGER=\"foo\" \ XDEBUG_CONFIG=\"client_port=${PHP_XDEBUG_PORT} client_host=$${DOCKER_HOST}\" \ - bin/phpunit -c Web/typo3conf/ext/menus/Build/phpunit/UnitTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE}; + .Build/bin/phpunit -c menus/Build/phpunit/UnitTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE}; fi " diff --git a/Tests/Functional/Compiler/LanguageMenuCompilerTest.php b/Tests/Functional/Compiler/LanguageMenuCompilerTest.php index d2aa90b..8869ac4 100644 --- a/Tests/Functional/Compiler/LanguageMenuCompilerTest.php +++ b/Tests/Functional/Compiler/LanguageMenuCompilerTest.php @@ -239,13 +239,10 @@ protected function compileMenu(array $pageDataset, array $configuration = []): a foreach ($pageDataset as $page) { $connection->insert('pages', $page); } - $controller = $this->getAccessibleMock( - TypoScriptFrontendController::class, - ['get_cache_timeout'], - [], - '', - false - ); + $controller = $this->getMockBuilder($this->buildAccessibleProxy(TypoScriptFrontendController::class)) + ->onlyMethods(['get_cache_timeout']) + ->disableOriginalConstructor() + ->getMock(); $GLOBALS['TSFE'] = $controller; if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() < 12) { $GLOBALS['TSFE']->id = '1'; @@ -259,7 +256,10 @@ protected function compileMenu(array $pageDataset, array $configuration = []): a ->getMock(); $pageRepository = GeneralUtility::makeInstance(PageRepository::class); $menuRepository = GeneralUtility::makeInstance(MenuRepository::class, $context, $pageRepository, $this->createMock(EventDispatcherInterface::class)); - $cacheHelper = $this->getAccessibleMock(CacheHelper::class, ['foo'], [], '', false); + $cacheHelper = $this->getMockBuilder($this->buildAccessibleProxy(CacheHelper::class)) + ->onlyMethods([]) + ->disableOriginalConstructor() + ->getMock(); $cacheHelper->_set('disableCaching', true); $languageMenuCompiler = $this->getMockBuilder(LanguageMenuCompiler::class) ->onlyMethods( diff --git a/Tests/Functional/DataProcessing/DataProcessingTest.php b/Tests/Functional/DataProcessing/DataProcessingTest.php index cb391a2..8472fae 100644 --- a/Tests/Functional/DataProcessing/DataProcessingTest.php +++ b/Tests/Functional/DataProcessing/DataProcessingTest.php @@ -29,7 +29,7 @@ abstract class DataProcessingTest extends FunctionalTestCase protected function setUp(): void { parent::setUp(); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/../Fixtures/pages.csv'); } protected function reduceResults(array $results): array @@ -78,17 +78,18 @@ protected function getTypoScriptFrontendController(Site $site, int $pageId): Typ $frontendUserAuth = $this->getMockBuilder(FrontendUserAuthentication::class) ->disableOriginalConstructor() ->getMock(); - $controller = $this->getAccessibleMock( - TypoScriptFrontendController::class, - ['get_cache_timeout'], - [ - $context, - $site, - $siteLanguage, - $pageArguments, - $frontendUserAuth, - ] - ); + $controller = $this->getMockBuilder($this->buildAccessibleProxy(TypoScriptFrontendController::class)) + ->onlyMethods(['get_cache_timeout']) + ->setConstructorArgs( + [ + $context, + $site, + $siteLanguage, + $pageArguments, + $frontendUserAuth, + ] + ) + ->getMock(); $controller->expects(self::any())->method('get_cache_timeout')->willReturn(1); return $controller; } diff --git a/Tests/Functional/Domain/Repository/MenuRepositoryTest.php b/Tests/Functional/Domain/Repository/MenuRepositoryTest.php index e07b89d..d0aca6c 100644 --- a/Tests/Functional/Domain/Repository/MenuRepositoryTest.php +++ b/Tests/Functional/Domain/Repository/MenuRepositoryTest.php @@ -27,7 +27,7 @@ class MenuRepositoryTest extends FunctionalTestCase */ public function translatedPageIsNotInMenuIfNavHideIsSet(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Domain/Repository/Fixtures/translated_page_with_nav_hide.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/translated_page_with_nav_hide.csv'); $languageAspect = GeneralUtility::makeInstance(LanguageAspect::class, 1); $context = GeneralUtility::makeInstance(Context::class); $context->setAspect('language', $languageAspect); @@ -44,7 +44,7 @@ public function translatedPageIsNotInMenuIfNavHideIsSet(): void */ public function translatedPageIsInMenuIfNavHideAndIgnoreNavHideIsSet(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Domain/Repository/Fixtures/translated_page_with_nav_hide.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/translated_page_with_nav_hide.csv'); $languageAspect = GeneralUtility::makeInstance(LanguageAspect::class, 1); $context = GeneralUtility::makeInstance(Context::class); $context->setAspect('language', $languageAspect); diff --git a/Tests/Functional/Frontend/BreadcrumbMenuContentObjectTest.php b/Tests/Functional/Frontend/BreadcrumbMenuContentObjectTest.php index 5bd44d0..2b2b628 100644 --- a/Tests/Functional/Frontend/BreadcrumbMenuContentObjectTest.php +++ b/Tests/Functional/Frontend/BreadcrumbMenuContentObjectTest.php @@ -19,8 +19,8 @@ class BreadcrumbMenuContentObjectTest extends AbstractFrontendTest */ public function menuOnRootPage(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/breadcrumb_menu_content_object_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/breadcrumb_menu_content_object_typoscript.csv'); $response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/')); $expected = 'root'; $body = (string)$response->getBody(); @@ -32,8 +32,8 @@ public function menuOnRootPage(): void */ public function menuOnSubpage(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/breadcrumb_menu_content_object_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/breadcrumb_menu_content_object_typoscript.csv'); $response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/page-1')); $expected = 'rootpage-1'; $body = (string)$response->getBody(); diff --git a/Tests/Functional/Frontend/BreadcrumbMenuFluidTest.php b/Tests/Functional/Frontend/BreadcrumbMenuFluidTest.php index 5710117..681665d 100644 --- a/Tests/Functional/Frontend/BreadcrumbMenuFluidTest.php +++ b/Tests/Functional/Frontend/BreadcrumbMenuFluidTest.php @@ -19,8 +19,8 @@ class BreadcrumbMenuFluidTest extends AbstractFrontendTest */ public function menuOnRootPage(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/breadcrumb_menu_fluid_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/breadcrumb_menu_fluid_typoscript.csv'); $response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/')); $expected = 'root'; $body = (string)$response->getBody(); @@ -32,8 +32,8 @@ public function menuOnRootPage(): void */ public function menuOnSubpage(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/breadcrumb_menu_fluid_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/breadcrumb_menu_fluid_typoscript.csv'); $response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/page-1')); $expected = 'rootpage-1'; $body = (string)$response->getBody(); diff --git a/Tests/Functional/Frontend/LanguageMenuContentObjectTest.php b/Tests/Functional/Frontend/LanguageMenuContentObjectTest.php index c209b9f..3241972 100644 --- a/Tests/Functional/Frontend/LanguageMenuContentObjectTest.php +++ b/Tests/Functional/Frontend/LanguageMenuContentObjectTest.php @@ -19,9 +19,9 @@ class LanguageMenuContentObjectTest extends AbstractFrontendTest */ public function menuOnRootPage(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/translated_pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/language_menu_content_object_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/translated_pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/language_menu_content_object_typoscript.csv'); $response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/')); $expected = 'englishgerman'; $body = (string)$response->getBody(); @@ -33,9 +33,9 @@ public function menuOnRootPage(): void */ public function menuOnSubpage(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/translated_pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/language_menu_content_object_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/translated_pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/language_menu_content_object_typoscript.csv'); $response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/de/')); $expected = 'englishgerman'; $body = (string)$response->getBody(); diff --git a/Tests/Functional/Frontend/LanguageMenuFluidTest.php b/Tests/Functional/Frontend/LanguageMenuFluidTest.php index 615b0a1..994ba58 100644 --- a/Tests/Functional/Frontend/LanguageMenuFluidTest.php +++ b/Tests/Functional/Frontend/LanguageMenuFluidTest.php @@ -19,9 +19,9 @@ class LanguageMenuFluidTest extends AbstractFrontendTest */ public function menuOnRootPage(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/translated_pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/language_menu_fluid_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/translated_pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/language_menu_fluid_typoscript.csv'); $response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/')); $expected = 'englishgerman'; $body = (string)$response->getBody(); @@ -33,9 +33,9 @@ public function menuOnRootPage(): void */ public function menuOnSubpage(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/translated_pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/language_menu_fluid_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/translated_pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/language_menu_fluid_typoscript.csv'); $response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/de/')); $expected = 'englishgerman'; $body = (string)$response->getBody(); diff --git a/Tests/Functional/Frontend/ListMenuContentObjectTest.php b/Tests/Functional/Frontend/ListMenuContentObjectTest.php index 9b825e2..ae4a8c6 100644 --- a/Tests/Functional/Frontend/ListMenuContentObjectTest.php +++ b/Tests/Functional/Frontend/ListMenuContentObjectTest.php @@ -19,8 +19,8 @@ class ListMenuContentObjectTest extends AbstractFrontendTest */ public function menuOnRootPage(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/list_menu_content_object_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/list_menu_content_object_typoscript.csv'); $response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/')); $expected = 'page-1'; $body = (string)$response->getBody(); @@ -32,8 +32,8 @@ public function menuOnRootPage(): void */ public function menuOnSubpage(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/list_menu_content_object_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/list_menu_content_object_typoscript.csv'); $response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/page-1')); $expected = 'page-1'; $body = (string)$response->getBody(); diff --git a/Tests/Functional/Frontend/ListMenuFluidTest.php b/Tests/Functional/Frontend/ListMenuFluidTest.php index dde9395..dbe362f 100644 --- a/Tests/Functional/Frontend/ListMenuFluidTest.php +++ b/Tests/Functional/Frontend/ListMenuFluidTest.php @@ -19,8 +19,8 @@ class ListMenuFluidTest extends AbstractFrontendTest */ public function menuOnRootPage(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/list_menu_fluid_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/list_menu_fluid_typoscript.csv'); $response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/')); $expected = 'page-1'; $body = (string)$response->getBody(); @@ -32,8 +32,8 @@ public function menuOnRootPage(): void */ public function menuOnSubpage(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/list_menu_fluid_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/list_menu_fluid_typoscript.csv'); $response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/page-1')); $expected = 'page-1'; $body = (string)$response->getBody(); diff --git a/Tests/Functional/Frontend/TreeMenuContentObjectTest.php b/Tests/Functional/Frontend/TreeMenuContentObjectTest.php index a393e65..8a22008 100644 --- a/Tests/Functional/Frontend/TreeMenuContentObjectTest.php +++ b/Tests/Functional/Frontend/TreeMenuContentObjectTest.php @@ -19,8 +19,8 @@ class TreeMenuContentObjectTest extends AbstractFrontendTest */ public function menuOnRootPage(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/tree_menu_content_object_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/tree_menu_content_object_typoscript.csv'); $response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/')); $expected = 'page-1page-2'; $body = (string)$response->getBody(); @@ -32,8 +32,8 @@ public function menuOnRootPage(): void */ public function menuOnSubpage(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/tree_menu_content_object_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/tree_menu_content_object_typoscript.csv'); $response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/page-1')); $expected = 'page-1page-2'; $body = (string)$response->getBody(); diff --git a/Tests/Functional/Frontend/TreeMenuFluidTest.php b/Tests/Functional/Frontend/TreeMenuFluidTest.php index 733fdb9..6553aa8 100644 --- a/Tests/Functional/Frontend/TreeMenuFluidTest.php +++ b/Tests/Functional/Frontend/TreeMenuFluidTest.php @@ -20,8 +20,8 @@ class TreeMenuFluidTest extends AbstractFrontendTest */ public function menuOnRootPage(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/tree_menu_fluid_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/tree_menu_fluid_typoscript.csv'); $response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/')); $expected = 'page-1page-2'; $body = (string)$response->getBody(); @@ -33,8 +33,8 @@ public function menuOnRootPage(): void */ public function menuOnSubpage(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/tree_menu_fluid_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/tree_menu_fluid_typoscript.csv'); $response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/page-1')); $expected = 'page-1page-2'; $body = (string)$response->getBody(); @@ -46,8 +46,8 @@ public function menuOnSubpage(): void */ public function menuWithAccessRestrictionForNotLoggedinUser(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/access_restriction.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/tree_menu_fluid_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/access_restriction.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/tree_menu_fluid_typoscript.csv'); $response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/')); $body = (string)$response->getBody(); self::assertStringContainsString('page-1', $body); @@ -59,8 +59,8 @@ public function menuWithAccessRestrictionForNotLoggedinUser(): void */ public function menuWithAccessRestrictionForLoggedinUser(): void { - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/access_restriction.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/tree_menu_fluid_typoscript.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/access_restriction.csv'); + $this->importCSVDataSet(__DIR__ . '/Fixtures/tree_menu_fluid_typoscript.csv'); $context = (new InternalRequestContext())->withFrontendUserId(1); $request = new InternalRequest('http://localhost/'); $response = $this->executeFrontendRequestWrapper($request, $context); diff --git a/Tests/Functional/Hooks/DataHandlerTest.php b/Tests/Functional/Hooks/DataHandlerTest.php index 01e6195..8b7cd24 100644 --- a/Tests/Functional/Hooks/DataHandlerTest.php +++ b/Tests/Functional/Hooks/DataHandlerTest.php @@ -28,8 +28,8 @@ class DataHandlerTest extends FunctionalTestCase protected function setUp(): void { parent::setUp(); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Fixtures/pages.csv'); - $this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Fixtures/caches.csv'); + $this->importCSVDataSet(__DIR__ . '/../Fixtures/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/../Fixtures/caches.csv'); $this->importCSVDataSet(__DIR__ . '/../Fixtures/be_users.csv'); $this->backendUser = $GLOBALS['BE_USER'] = $this->setUpBackendUser(1); Bootstrap::initializeLanguageObject(); diff --git a/composer.json b/composer.json index acce1ee..1bb8c01 100644 --- a/composer.json +++ b/composer.json @@ -5,8 +5,8 @@ "description": "Easy and fast menus for TYPO3 Frontends", "require": { "php": "^7.4 || ~8.0", - "typo3/cms-core": "^10 || ^11 || 12.*.*@dev", - "typo3/cms-frontend": "^10 || ^11 || 12.*.*@dev" + "typo3/cms-core": "^10 || ^11 || ^12.4", + "typo3/cms-frontend": "^10 || ^11 || ^12.4" }, "require-dev": { "phpstan/phpstan": "^1.8.11", @@ -15,7 +15,7 @@ "typo3/cms-install": "^11.5", "typo3/coding-standards": "^0.5", "typo3/tailor": "^1.0", - "typo3/testing-framework": "~7.0@dev" + "typo3/testing-framework": "^7" }, "config": { "vendor-dir": ".Build/vendor",