Skip to content

Commit 33d395b

Browse files
committed
Drop v13 support on main branch
1 parent e4dd21f commit 33d395b

File tree

6 files changed

+13
-26
lines changed

6 files changed

+13
-26
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
fail-fast: false
88
matrix:
99
php: [ '8.3', '8.4', '8.5' ]
10-
typo3: [ '13', '14' ]
10+
typo3: [ '14' ]
1111
steps:
1212
- uses: actions/checkout@v6
1313
- name: Setup PHP with PECL extension

Classes/Cache/RemoteFileBackend.php

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -263,15 +263,9 @@ protected function getFileName(string $entryIdentifier): string
263263
}
264264

265265
try {
266-
if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 14) {
267-
/** @var ResourceFactory $resourceFactory */
268-
// @phpstan-ignore-next-line
269-
$resourceFactory = GeneralUtility::makeInstance(ResourceFactory::class);
270-
} else {
271-
/** @var StorageRepository $resourceFactory */
272-
// @phpstan-ignore-next-line
273-
$resourceFactory = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
274-
}
266+
/** @var StorageRepository $resourceFactory */
267+
// @phpstan-ignore-next-line
268+
$resourceFactory = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
275269

276270
// @phpstan-ignore-next-line
277271
$storage = $resourceFactory->getDefaultStorage();

Classes/Cache/StaticDatabaseBackend.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,11 @@ abstract class StaticDatabaseBackend extends Typo3DatabaseBackend implements Log
2626
/**
2727
* Constructs this backend.
2828
*
29-
* @param mixed $context application context
3029
* @param array $options Configuration options - depends on the actual backend
3130
*/
32-
public function __construct($context, array $options = [])
31+
public function __construct(array $options = [])
3332
{
34-
if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 14) {
35-
// @phpstan-ignore-next-line
36-
parent::__construct($context, $options);
37-
} else {
38-
// Note. In v14 there is only the options array. So the first Param are the options.
39-
parent::__construct($context);
40-
}
33+
parent::__construct($options);
4134
$this->configuration = GeneralUtility::makeInstance(ConfigurationService::class);
4235
}
4336

Classes/Cache/StaticFileBackend.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ class StaticFileBackend extends StaticDatabaseBackend implements TransientBacken
3737
{
3838
protected EventDispatcherInterface $eventDispatcher;
3939

40-
public function __construct($context, array $options = [])
40+
public function __construct(array $options = [])
4141
{
4242
$this->eventDispatcher = GeneralUtility::makeInstance(EventDispatcherInterface::class);
43-
parent::__construct($context, $options);
43+
parent::__construct($options);
4444
}
4545

4646
/**

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
"php": "^8.3",
3434
"ext-pdo": "*",
3535
"ext-zlib": "*",
36-
"typo3/cms-core": "^13.4||^14.0",
37-
"typo3/cms-backend": "^13.4||^14.0",
38-
"typo3/cms-extensionmanager": "^13.4||^14.0"
36+
"typo3/cms-core": "^14.0",
37+
"typo3/cms-backend": "^14.0",
38+
"typo3/cms-extensionmanager": "^14.0"
3939
},
4040
"license": "GPL-2.0-or-later",
4141
"homepage": "https://extensions.typo3.org/extension/staticfilecache",

ext_emconf.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
'category' => 'fe',
99
'constraints' => [
1010
'depends' => [
11-
'typo3' => '134.0-14.4.99',
12-
'backend' => '13.4.0-14.4.99',
11+
'typo3' => '14.0-14.4.99',
12+
'backend' => '14.0-14.4.99',
1313
'php' => '8.3.0-8.99.99',
1414
],
1515
],

0 commit comments

Comments
 (0)