Skip to content

Commit e2b8494

Browse files
committed
Merge branch 'typo3-115-support' into release/2.0.0
# Conflicts: # composer.json # ext_emconf.php
2 parents 96e2903 + b86ef62 commit e2b8494

File tree

5 files changed

+6
-9
lines changed

5 files changed

+6
-9
lines changed

Classes/Controller/AdministrationController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ protected function getDefaultSiteIdentifier(): string
7373
$lastSelectedSiteIdentifier
7474
= $this->getUserModuleData('lastSelectedSiteIdentifier');
7575

76-
if ($sites[$lastSelectedSiteIdentifier] instanceof Site) {
76+
if ($lastSelectedSiteIdentifier !== null && $sites[$lastSelectedSiteIdentifier] instanceof Site) {
7777
return $sites[$lastSelectedSiteIdentifier]->getIdentifier();
7878
}
7979

Classes/Serializer/Subscriber/AbstractEntitySubscriber.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ protected function addIri(AbstractDomainObject $entity, JsonSerializationVisitor
129129
$apiResource = $this->apiResourceRepository->getByEntity($entity);
130130
if ($apiResource && $apiResource->getMainItemOperation()) {
131131
// @todo should be generated with symfony router
132-
$iri = str_replace('{id}', $entity->getUid(), $apiResource->getMainItemOperation()->getRoute()->getPath());
132+
$iri = str_replace('{id}', (string)$entity->getUid(), $apiResource->getMainItemOperation()->getRoute()->getPath());
133133
$visitor->visitProperty(
134134
new StaticPropertyMetadata(AbstractDomainObject::class, '@id', $iri),
135135
$iri

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^7.2.0",
15+
"php": "^7.2.0 || ^8.0.0",
1616
"ext-json": "*",
1717
"ext-tokenizer": "*",
1818
"ext-pdo": "*",
@@ -23,7 +23,7 @@
2323
"symfony/routing": "^4.1 || ^5.0",
2424
"symfony/expression-language": "^4.1 || ^5.0",
2525
"symfony/http-foundation": "^4.2.9 || ^5.0",
26-
"symfony/psr-http-message-bridge": "^1.2",
26+
"symfony/psr-http-message-bridge": "^2.1",
2727
"symfony/property-info": "^4.4 || ^5.0",
2828
"symfony/mime": "^4.4 || ^5.0",
2929
"symfony/cache": "^4.4 || ^5.0",

ext_emconf.php

+1-4
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,10 @@
77
'author' => 'SourceBroker Team',
88
'author_email' => '[email protected]',
99
'state' => 'stable',
10-
'uploadfolder' => 0,
11-
'createDirs' => '',
12-
'clearCacheOnLoad' => 0,
1310
'version' => '1.2.3',
1411
'constraints' => [
1512
'depends' => [
16-
'php' => '7.2.0-7.4.99',
13+
'php' => '7.2.0-8.0.99',
1714
'typo3' => '10.4.0-11.5.99',
1815
],
1916
'conflicts' => [],

ext_localconf.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ static function () {
9393
$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['t3api']['cors']['maxAge'] = 0;
9494
$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['t3api']['cors']['originRegex'] = false;
9595

96-
if (!is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['t3api'])) {
96+
if (!isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['t3api']) || !is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['t3api'])) {
9797
$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['t3api'] = [
9898
'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
9999
'backend' => \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend::class,

0 commit comments

Comments
 (0)