Skip to content

Commit 5e1c714

Browse files
mbrodalambrodala
committed
[BUGFIX] Keep SiteConfiguration in tests for TYPO3v12
1 parent 6ca493c commit 5e1c714

File tree

3 files changed

+90
-36
lines changed

3 files changed

+90
-36
lines changed

‎Tests/Functional/Hook/DataHandler/AddRedirectTest.php‎

Lines changed: 40 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use TYPO3\CMS\Core\Configuration\SiteWriter;
1111
use TYPO3\CMS\Core\Database\ConnectionPool;
1212
use TYPO3\CMS\Core\DataHandling\DataHandler;
13+
use TYPO3\CMS\Core\Information\Typo3Version;
1314
use TYPO3\CMS\Core\Localization\LanguageServiceFactory;
1415
use TYPO3\CMS\Core\Utility\GeneralUtility;
1516
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
@@ -44,24 +45,46 @@ public function addsRedirectsOnSlugChange(array $pages, array $changes, array $e
4445
]);
4546
$this->setUpFrontendRootPage(1);
4647

47-
$siteWriter = GeneralUtility::makeInstance(SiteWriter::class);
48-
$siteWriter->createNewBasicSite('1', 1, '/');
4948
$siteConfiguration = GeneralUtility::makeInstance(SiteConfiguration::class);
50-
$siteConfigurationData = $siteConfiguration->load('1');
51-
$siteConfigurationData['languages'][1] = [
52-
'title' => 'German',
53-
'enabled' => true,
54-
'languageId' => 1,
55-
'base' => '/de/',
56-
'typo3Language' => 'default',
57-
'locale' => 'de_DE.UTF-8',
58-
'iso-639-1' => 'de',
59-
'navigationTitle' => 'Deutsch',
60-
'hreflang' => 'de-de',
61-
'direction' => 'ltr',
62-
'flag' => 'de',
63-
];
64-
$siteWriter->write('1', $siteConfigurationData);
49+
50+
if ((new Typo3Version())->getMajorVersion() > 12) {
51+
$siteWriter = GeneralUtility::makeInstance(SiteWriter::class);
52+
$siteWriter->createNewBasicSite('1', 1, '/');
53+
$siteConfiguration = GeneralUtility::makeInstance(SiteConfiguration::class);
54+
$siteConfigurationData = $siteConfiguration->load('1');
55+
$siteConfigurationData['languages'][1] = [
56+
'title' => 'German',
57+
'enabled' => true,
58+
'languageId' => 1,
59+
'base' => '/de/',
60+
'typo3Language' => 'default',
61+
'locale' => 'de_DE.UTF-8',
62+
'iso-639-1' => 'de',
63+
'navigationTitle' => 'Deutsch',
64+
'hreflang' => 'de-de',
65+
'direction' => 'ltr',
66+
'flag' => 'de',
67+
];
68+
$siteWriter->write('1', $siteConfigurationData);
69+
} else {
70+
$siteConfiguration = GeneralUtility::makeInstance(SiteConfiguration::class);
71+
$siteConfiguration->createNewBasicSite('1', 1, '/');
72+
$siteConfigurationData = $siteConfiguration->load('1');
73+
$siteConfigurationData['languages'][1] = [
74+
'title' => 'German',
75+
'enabled' => true,
76+
'languageId' => 1,
77+
'base' => '/de/',
78+
'typo3Language' => 'default',
79+
'locale' => 'de_DE.UTF-8',
80+
'iso-639-1' => 'de',
81+
'navigationTitle' => 'Deutsch',
82+
'hreflang' => 'de-de',
83+
'direction' => 'ltr',
84+
'flag' => 'de',
85+
];
86+
$siteConfiguration->write('1', $siteConfigurationData);
87+
}
6588

6689
$pageConnection->bulkInsert(
6790
'pages',

‎Tests/Functional/Hook/DataHandler/ResolveRedirectConflictTest.php‎

Lines changed: 41 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use TYPO3\CMS\Core\Configuration\SiteWriter;
1111
use TYPO3\CMS\Core\Database\ConnectionPool;
1212
use TYPO3\CMS\Core\DataHandling\DataHandler;
13+
use TYPO3\CMS\Core\Information\Typo3Version;
1314
use TYPO3\CMS\Core\Localization\LanguageServiceFactory;
1415
use TYPO3\CMS\Core\Utility\GeneralUtility;
1516
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
@@ -43,8 +44,13 @@ public function resolvesPagePathRedirectConflicts(): void
4344
]);
4445
$this->setUpFrontendRootPage(1);
4546

46-
$siteWriter = GeneralUtility::makeInstance(SiteWriter::class);
47-
$siteWriter->createNewBasicSite('1', 1, '/');
47+
if ((new Typo3Version())->getMajorVersion() > 12) {
48+
$siteWriter = GeneralUtility::makeInstance(SiteWriter::class);
49+
$siteWriter->createNewBasicSite('1', 1, '/');
50+
} else {
51+
$siteConfiguration = GeneralUtility::makeInstance(SiteConfiguration::class);
52+
$siteConfiguration->createNewBasicSite('1', 1, '/');
53+
}
4854

4955
$pageConnection->insert('pages', [
5056
'uid' => 2,
@@ -121,22 +127,40 @@ public function normalizesPagePath(): void
121127
]);
122128
$this->setUpFrontendRootPage(1);
123129

124-
$siteWriter = GeneralUtility::makeInstance(SiteWriter::class);
125-
$siteWriter->createNewBasicSite('1', 1, 'http://localhost/');
126-
// Enforce trailing slash for generated page URIs
127-
$siteConfiguration = GeneralUtility::makeInstance(SiteConfiguration::class);
128-
$siteConfigurationData = $siteConfiguration->load('1');
129-
$siteConfigurationData['routeEnhancers'] = [
130-
'pageTypeSuffix' => [
131-
'type' => 'PageType',
132-
'default' => '/',
133-
'index' => '',
134-
'map' => [
135-
'/' => 0,
130+
131+
if ((new Typo3Version())->getMajorVersion() > 12) {
132+
$siteWriter = GeneralUtility::makeInstance(SiteWriter::class);
133+
$siteWriter->createNewBasicSite('1', 1, 'http://localhost/');
134+
// Enforce trailing slash for generated page URIs
135+
$siteConfiguration = GeneralUtility::makeInstance(SiteConfiguration::class);
136+
$siteConfigurationData = $siteConfiguration->load('1');
137+
$siteConfigurationData['routeEnhancers'] = [
138+
'pageTypeSuffix' => [
139+
'type' => 'PageType',
140+
'default' => '/',
141+
'index' => '',
142+
'map' => [
143+
'/' => 0,
144+
],
136145
],
137-
],
138-
];
139-
$siteWriter->write('1', $siteConfigurationData);
146+
];
147+
$siteWriter->write('1', $siteConfigurationData);
148+
} else {
149+
$siteConfiguration = GeneralUtility::makeInstance(SiteConfiguration::class);
150+
$siteConfiguration->createNewBasicSite('1', 1, '/');
151+
$siteConfigurationData = $siteConfiguration->load('1');
152+
$siteConfigurationData['routeEnhancers'] = [
153+
'pageTypeSuffix' => [
154+
'type' => 'PageType',
155+
'default' => '/',
156+
'index' => '',
157+
'map' => [
158+
'/' => 0,
159+
],
160+
],
161+
];
162+
$siteConfiguration->write('1', $siteConfigurationData);
163+
}
140164

141165
$pageConnection->insert('pages', [
142166
'uid' => 2,

‎Tests/Functional/Middleware/FlatUrlRedirectTest.php‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
use PHPUnit\Framework\Attributes\Test;
88
use PHPUnit\Framework\Attributes\TestWith;
9+
use TYPO3\CMS\Core\Configuration\SiteConfiguration;
910
use TYPO3\CMS\Core\Configuration\SiteWriter;
11+
use TYPO3\CMS\Core\Information\Typo3Version;
1012
use TYPO3\CMS\Core\Utility\GeneralUtility;
1113
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
1214
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
@@ -34,8 +36,13 @@ protected function setUp(): void
3436
'EXT:flat_urls/Tests/Functional/Middleware/Fixtures/TypoScript/page.typoscript',
3537
]);
3638

37-
$siteWriter = GeneralUtility::makeInstance(SiteWriter::class);
38-
$siteWriter->createNewBasicSite('1', 1, 'http://localhost/');
39+
if ((new Typo3Version())->getMajorVersion() > 12) {
40+
$siteWriter = GeneralUtility::makeInstance(SiteWriter::class);
41+
$siteWriter->createNewBasicSite('1', 1, 'http://localhost/');
42+
} else {
43+
$siteConfiguration = GeneralUtility::makeInstance(SiteConfiguration::class);
44+
$siteConfiguration->createNewBasicSite('1', 1, 'http://localhost/');
45+
}
3946
}
4047

4148
#[Test]

0 commit comments

Comments
 (0)