Skip to content

Commit 251ae22

Browse files
achimfritzachimfritz
authored
Merge pull request #94 from b13/task/ci
[TASK] TYPO3 12.4 LTS
2 parents 140236e + 1eb5703 commit 251ae22

17 files changed

+75
-85
lines changed

‎Build/phpstan10.neon‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ parameters:
66
- %currentWorkingDirectory%/Tests
77

88
ignoreErrors:
9-
-
10-
message: '#Constant ORIGINAL_ROOT not found.#'
11-
path: %currentWorkingDirectory%/Tests
129
-
1310
message: '#Call to an undefined method B13\\Menus\\ContentObject\\.*ContentObject::setContentObjectRenderer\(\).#'
1411
path: %currentWorkingDirectory%/Classes/ContentObject/*

‎Build/phpstan11.neon‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,3 @@ parameters:
44
paths:
55
- %currentWorkingDirectory%/Classes
66
- %currentWorkingDirectory%/Tests
7-
8-
ignoreErrors:
9-
-
10-
message: '#Constant ORIGINAL_ROOT not found.#'
11-
path: %currentWorkingDirectory%/Tests

‎Build/phpstan12.neon‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ parameters:
66
- %currentWorkingDirectory%/Tests
77

88
ignoreErrors:
9-
-
10-
message: '#Constant ORIGINAL_ROOT not found.#'
11-
path: %currentWorkingDirectory%/Tests
129
-
1310
message: '#Call to an undefined static method TYPO3\\CMS\\Frontend\\ContentObject\\AbstractContentObject::__construct\(\).#'
1411
path: %currentWorkingDirectory%/Classes/ContentObject/*

‎Build/testing-docker/docker-compose.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ services:
9292
fi
9393
composer prepare-tests-10 && composer prepare-tests
9494
else
95-
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
95+
composer require typo3/cms-install:^12.4 typo3/cms-fluid-styled-content:^12.4 --dev -W --no-progress --no-interaction
9696
composer prepare-tests
9797
fi
9898
"
@@ -147,7 +147,7 @@ services:
147147
typo3DatabaseUsername: root
148148
typo3DatabasePassword: funcp
149149
typo3DatabaseHost: mariadb10
150-
working_dir: ${ROOT_DIR}/.Build
150+
working_dir: ${ROOT_DIR}
151151
command: >
152152
/bin/sh -c "
153153
if [ ${SCRIPT_VERBOSE} -eq 1 ]; then
@@ -161,13 +161,13 @@ services:
161161
php -v | grep '^PHP';
162162
if [ ${PHP_XDEBUG_ON} -eq 0 ]; then
163163
export XDEBUG_MODE=\"off\"
164-
bin/phpunit -c Web/typo3conf/ext/menus/Build/phpunit/FunctionalTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE};
164+
.Build/bin/phpunit -c Build/phpunit/FunctionalTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE};
165165
else
166166
DOCKER_HOST=`route -n | awk '/^0.0.0.0/ { print $$2 }'`
167167
export XDEBUG_MODE=\"debug,develop\" \
168168
XDEBUG_TRIGGER=\"foo\" \
169169
XDEBUG_CONFIG=\"client_port=${PHP_XDEBUG_PORT} client_host=$${DOCKER_HOST}\"
170-
bin/phpunit -c Web/typo3conf/ext/menus/Build/phpunit/FunctionalTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE};
170+
.Build/bin/phpunit -c Build/phpunit/FunctionalTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE};
171171
fi
172172
"
173173
lint:
@@ -213,7 +213,7 @@ services:
213213
- ${HOST_HOME}:${HOST_HOME}
214214
- /etc/passwd:/etc/passwd:ro
215215
- /etc/group:/etc/group:ro
216-
working_dir: ${ROOT_DIR}/.Build
216+
working_dir: ${ROOT_DIR}
217217
command: >
218218
/bin/sh -c "
219219
if [ ${SCRIPT_VERBOSE} -eq 1 ]; then
@@ -222,12 +222,12 @@ services:
222222
php -v | grep '^PHP';
223223
if [ ${PHP_XDEBUG_ON} -eq 0 ]; then
224224
XDEBUG_MODE=\"off\" \
225-
bin/phpunit -c Web/typo3conf/ext/menus/Build/phpunit/UnitTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE};
225+
.Build/bin/phpunit -c Build/phpunit/UnitTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE};
226226
else
227227
DOCKER_HOST=`route -n | awk '/^0.0.0.0/ { print $$2 }'`
228228
XDEBUG_MODE=\"debug,develop\" \
229229
XDEBUG_TRIGGER=\"foo\" \
230230
XDEBUG_CONFIG=\"client_port=${PHP_XDEBUG_PORT} client_host=$${DOCKER_HOST}\" \
231-
bin/phpunit -c Web/typo3conf/ext/menus/Build/phpunit/UnitTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE};
231+
.Build/bin/phpunit -c menus/Build/phpunit/UnitTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE};
232232
fi
233233
"

‎Tests/Functional/Compiler/LanguageMenuCompilerTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -239,13 +239,10 @@ protected function compileMenu(array $pageDataset, array $configuration = []): a
239239
foreach ($pageDataset as $page) {
240240
$connection->insert('pages', $page);
241241
}
242-
$controller = $this->getAccessibleMock(
243-
TypoScriptFrontendController::class,
244-
['get_cache_timeout'],
245-
[],
246-
'',
247-
false
248-
);
242+
$controller = $this->getMockBuilder($this->buildAccessibleProxy(TypoScriptFrontendController::class))
243+
->onlyMethods(['get_cache_timeout'])
244+
->disableOriginalConstructor()
245+
->getMock();
249246
$GLOBALS['TSFE'] = $controller;
250247
if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() < 12) {
251248
$GLOBALS['TSFE']->id = '1';
@@ -259,7 +256,10 @@ protected function compileMenu(array $pageDataset, array $configuration = []): a
259256
->getMock();
260257
$pageRepository = GeneralUtility::makeInstance(PageRepository::class);
261258
$menuRepository = GeneralUtility::makeInstance(MenuRepository::class, $context, $pageRepository, $this->createMock(EventDispatcherInterface::class));
262-
$cacheHelper = $this->getAccessibleMock(CacheHelper::class, ['foo'], [], '', false);
259+
$cacheHelper = $this->getMockBuilder($this->buildAccessibleProxy(CacheHelper::class))
260+
->onlyMethods([])
261+
->disableOriginalConstructor()
262+
->getMock();
263263
$cacheHelper->_set('disableCaching', true);
264264
$languageMenuCompiler = $this->getMockBuilder(LanguageMenuCompiler::class)
265265
->onlyMethods(

‎Tests/Functional/DataProcessing/DataProcessingTest.php‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ abstract class DataProcessingTest extends FunctionalTestCase
2929
protected function setUp(): void
3030
{
3131
parent::setUp();
32-
$this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Fixtures/pages.csv');
32+
$this->importCSVDataSet(__DIR__ . '/../Fixtures/pages.csv');
3333
}
3434

3535
protected function reduceResults(array $results): array
@@ -78,17 +78,18 @@ protected function getTypoScriptFrontendController(Site $site, int $pageId): Typ
7878
$frontendUserAuth = $this->getMockBuilder(FrontendUserAuthentication::class)
7979
->disableOriginalConstructor()
8080
->getMock();
81-
$controller = $this->getAccessibleMock(
82-
TypoScriptFrontendController::class,
83-
['get_cache_timeout'],
84-
[
85-
$context,
86-
$site,
87-
$siteLanguage,
88-
$pageArguments,
89-
$frontendUserAuth,
90-
]
91-
);
81+
$controller = $this->getMockBuilder($this->buildAccessibleProxy(TypoScriptFrontendController::class))
82+
->onlyMethods(['get_cache_timeout'])
83+
->setConstructorArgs(
84+
[
85+
$context,
86+
$site,
87+
$siteLanguage,
88+
$pageArguments,
89+
$frontendUserAuth,
90+
]
91+
)
92+
->getMock();
9293
$controller->expects(self::any())->method('get_cache_timeout')->willReturn(1);
9394
return $controller;
9495
}

‎Tests/Functional/Domain/Repository/MenuRepositoryTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class MenuRepositoryTest extends FunctionalTestCase
2727
*/
2828
public function translatedPageIsNotInMenuIfNavHideIsSet(): void
2929
{
30-
$this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Domain/Repository/Fixtures/translated_page_with_nav_hide.csv');
30+
$this->importCSVDataSet(__DIR__ . '/Fixtures/translated_page_with_nav_hide.csv');
3131
$languageAspect = GeneralUtility::makeInstance(LanguageAspect::class, 1);
3232
$context = GeneralUtility::makeInstance(Context::class);
3333
$context->setAspect('language', $languageAspect);
@@ -44,7 +44,7 @@ public function translatedPageIsNotInMenuIfNavHideIsSet(): void
4444
*/
4545
public function translatedPageIsInMenuIfNavHideAndIgnoreNavHideIsSet(): void
4646
{
47-
$this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Domain/Repository/Fixtures/translated_page_with_nav_hide.csv');
47+
$this->importCSVDataSet(__DIR__ . '/Fixtures/translated_page_with_nav_hide.csv');
4848
$languageAspect = GeneralUtility::makeInstance(LanguageAspect::class, 1);
4949
$context = GeneralUtility::makeInstance(Context::class);
5050
$context->setAspect('language', $languageAspect);

‎Tests/Functional/Frontend/BreadcrumbMenuContentObjectTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class BreadcrumbMenuContentObjectTest extends AbstractFrontendTest
1919
*/
2020
public function menuOnRootPage(): void
2121
{
22-
$this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv');
23-
$this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/breadcrumb_menu_content_object_typoscript.csv');
22+
$this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv');
23+
$this->importCSVDataSet(__DIR__ . '/Fixtures/breadcrumb_menu_content_object_typoscript.csv');
2424
$response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/'));
2525
$expected = '<a href="/">root</a>';
2626
$body = (string)$response->getBody();
@@ -32,8 +32,8 @@ public function menuOnRootPage(): void
3232
*/
3333
public function menuOnSubpage(): void
3434
{
35-
$this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv');
36-
$this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/breadcrumb_menu_content_object_typoscript.csv');
35+
$this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv');
36+
$this->importCSVDataSet(__DIR__ . '/Fixtures/breadcrumb_menu_content_object_typoscript.csv');
3737
$response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/page-1'));
3838
$expected = '<a href="/">root</a><a href="/page-1">page-1</a>';
3939
$body = (string)$response->getBody();

‎Tests/Functional/Frontend/BreadcrumbMenuFluidTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class BreadcrumbMenuFluidTest extends AbstractFrontendTest
1919
*/
2020
public function menuOnRootPage(): void
2121
{
22-
$this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv');
23-
$this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/breadcrumb_menu_fluid_typoscript.csv');
22+
$this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv');
23+
$this->importCSVDataSet(__DIR__ . '/Fixtures/breadcrumb_menu_fluid_typoscript.csv');
2424
$response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/'));
2525
$expected = '<a href="/">root</a>';
2626
$body = (string)$response->getBody();
@@ -32,8 +32,8 @@ public function menuOnRootPage(): void
3232
*/
3333
public function menuOnSubpage(): void
3434
{
35-
$this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv');
36-
$this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/breadcrumb_menu_fluid_typoscript.csv');
35+
$this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv');
36+
$this->importCSVDataSet(__DIR__ . '/Fixtures/breadcrumb_menu_fluid_typoscript.csv');
3737
$response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/page-1'));
3838
$expected = '<a href="/">root</a><a href="/page-1">page-1</a>';
3939
$body = (string)$response->getBody();

‎Tests/Functional/Frontend/LanguageMenuContentObjectTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ class LanguageMenuContentObjectTest extends AbstractFrontendTest
1919
*/
2020
public function menuOnRootPage(): void
2121
{
22-
$this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv');
23-
$this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/translated_pages.csv');
24-
$this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/language_menu_content_object_typoscript.csv');
22+
$this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv');
23+
$this->importCSVDataSet(__DIR__ . '/Fixtures/translated_pages.csv');
24+
$this->importCSVDataSet(__DIR__ . '/Fixtures/language_menu_content_object_typoscript.csv');
2525
$response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/'));
2626
$expected = '<a href="/" class="active">english</a><a href="/de/">german</a>';
2727
$body = (string)$response->getBody();
@@ -33,9 +33,9 @@ public function menuOnRootPage(): void
3333
*/
3434
public function menuOnSubpage(): void
3535
{
36-
$this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/pages.csv');
37-
$this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/translated_pages.csv');
38-
$this->importCSVDataSet(ORIGINAL_ROOT . 'typo3conf/ext/menus/Tests/Functional/Frontend/Fixtures/language_menu_content_object_typoscript.csv');
36+
$this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv');
37+
$this->importCSVDataSet(__DIR__ . '/Fixtures/translated_pages.csv');
38+
$this->importCSVDataSet(__DIR__ . '/Fixtures/language_menu_content_object_typoscript.csv');
3939
$response = $this->executeFrontendRequestWrapper(new InternalRequest('http://localhost/de/'));
4040
$expected = '<a href="/">english</a><a href="/de/" class="active">german</a>';
4141
$body = (string)$response->getBody();

0 commit comments

Comments
 (0)