Skip to content

Commit 5dba0f3

Browse files
sbuerksbuerk
committed
[BUGFIX] Enforce classic mode in created TYPO3 entrypoint files
`typo3/testing-framework` provides a extended `SystemEnvironmentBuilder` to ensure correct instance initialization as classic mode in different test context environment, allowing to manual set the composer mode flag despite having the PHP define from parent composer installation as source. `Testbase->setUpInstanceCoreLinks()` additionally provides TYPO3 entrypoints in form of index.php files, calling the basic bootstrap, based on template files from system extensions and modified to use the `typo3/testing-framework` `SystemEnvironmentBuilder` but does not enforce non-composer (classic) mode. This does not hurt within functional tests but codeception based accceptance instances misses the enforced classic mode which can lead to several issues, for example normalizedParams path calculation as basis for additional path or link generation. This change modifies the entrypoint creation code to reflect this need and forces non-composer mode. Releases: main, 8
1 parent dd7505b commit 5dba0f3

File tree

1 file changed

+36
-11
lines changed

1 file changed

+36
-11
lines changed

‎Classes/Core/Testbase.php

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -239,23 +239,50 @@ public function setUpInstanceCoreLinks(
239239
$installPhpExists = file_exists($instancePath . '/typo3/sysext/install/Resources/Private/Php/install.php');
240240
if ($hasConsolidatedHttpEntryPoint) {
241241
$entryPointsToSet = [
242-
$instancePath . '/typo3/sysext/core/Resources/Private/Php/index.php' => $instancePath . '/index.php',
242+
[
243+
'source' => $instancePath . '/typo3/sysext/core/Resources/Private/Php/index.php',
244+
'target' => $instancePath . '/index.php',
245+
'pattern' => '/\\\\TYPO3\\\\CMS\\\\Core\\\\Core\\\\SystemEnvironmentBuilder::run\(\);/',
246+
'replacement' => '\TYPO3\TestingFramework\Core\SystemEnvironmentBuilder::run(0, 0, false);',
247+
],
243248
];
244249
if ($installPhpExists && in_array('install', $coreExtensions, true)) {
245-
$entryPointsToSet[$instancePath . '/typo3/sysext/install/Resources/Private/Php/install.php'] = $instancePath . '/typo3/install.php';
250+
$entryPointsToSet[] = [
251+
'source' => $instancePath . '/typo3/sysext/install/Resources/Private/Php/install.php',
252+
'target' => $instancePath . '/typo3/install.php',
253+
'pattern' => '/\\\\TYPO3\\\\CMS\\\\Core\\\\Core\\\\SystemEnvironmentBuilder::run\(1\);/',
254+
'replacement' => '\TYPO3\TestingFramework\Core\SystemEnvironmentBuilder::run(1, 0, false);',
255+
];
246256
}
247257
} else {
248258
$entryPointsToSet = [
249-
$instancePath . '/typo3/sysext/backend/Resources/Private/Php/backend.php' => $instancePath . '/typo3/index.php',
250-
$instancePath . '/typo3/sysext/frontend/Resources/Private/Php/frontend.php' => $instancePath . '/index.php',
259+
[
260+
'source' => $instancePath . '/typo3/sysext/backend/Resources/Private/Php/backend.php',
261+
'target' => $instancePath . '/typo3/index.php',
262+
'pattern' => '/\\\\TYPO3\\\\CMS\\\\Core\\\\Core\\\\SystemEnvironmentBuilder::run\(1, \\\\TYPO3\\\\CMS\\\\Core\\\\Core\\\\SystemEnvironmentBuilder::REQUESTTYPE_BE\);/',
263+
'replacement' => '\TYPO3\TestingFramework\Core\SystemEnvironmentBuilder::run(1, \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::REQUESTTYPE_BE, false);',
264+
],
265+
[
266+
'source' => $instancePath . '/typo3/sysext/frontend/Resources/Private/Php/frontend.php',
267+
'target' => $instancePath . '/index.php',
268+
'pattern' => '/\\\\TYPO3\\\\CMS\\\\Core\\\\Core\\\\SystemEnvironmentBuilder::run\(0, \\\\TYPO3\\\\CMS\\\\Core\\\\Core\\\\SystemEnvironmentBuilder::REQUESTTYPE_FE\);/',
269+
'replacement' => '\TYPO3\TestingFramework\Core\SystemEnvironmentBuilder::run(0, \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::REQUESTTYPE_FE, false);',
270+
],
251271
];
252272
if ($installPhpExists) {
253-
$entryPointsToSet[$instancePath . '/typo3/sysext/install/Resources/Private/Php/install.php'] = $instancePath . '/typo3/install.php';
273+
$entryPointsToSet[] = [
274+
'source' => $instancePath . '/typo3/sysext/install/Resources/Private/Php/install.php',
275+
'target' => $instancePath . '/typo3/install.php',
276+
'pattern' => '/\\\\TYPO3\\\\CMS\\\\Core\\\\Core\\\\SystemEnvironmentBuilder::run\(1, \\\\TYPO3\\\\CMS\\\\Core\\\\Core\\\\SystemEnvironmentBuilder::REQUESTTYPE_INSTALL\);/',
277+
'replacement' => '\TYPO3\TestingFramework\Core\SystemEnvironmentBuilder::run(1, \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::REQUESTTYPE_INSTALL, false);',
278+
];
254279
}
255280
}
256281
$autoloadFile = dirname(__DIR__, 4) . '/autoload.php';
257282

258-
foreach ($entryPointsToSet as $source => $target) {
283+
foreach ($entryPointsToSet as $entryPointToSet) {
284+
$source = $entryPointToSet['source'];
285+
$target = $entryPointToSet['target'];
259286
if (($entryPointContent = file_get_contents($source)) === false) {
260287
throw new \UnexpectedValueException(sprintf('Source file (%s) was not found.', $source), 1636244753);
261288
}
@@ -264,11 +291,9 @@ public function setUpInstanceCoreLinks(
264291
$this->findShortestPathCode($target, $autoloadFile),
265292
$entryPointContent
266293
);
267-
$entryPointContent = (string)preg_replace(
268-
'/\\\\TYPO3\\\\CMS\\\\Core\\\\Core\\\\SystemEnvironmentBuilder::run\(/',
269-
'\TYPO3\TestingFramework\Core\SystemEnvironmentBuilder::run(',
270-
$entryPointContent
271-
);
294+
$pattern = $entryPointToSet['pattern'];
295+
$replacement = $entryPointToSet['replacement'];
296+
$entryPointContent = (string)preg_replace($pattern, $replacement, $entryPointContent);
272297
if ($entryPointContent === '') {
273298
throw new \UnexpectedValueException(
274299
sprintf('Error while customizing the source file (%s).', $source),

0 commit comments

Comments
 (0)