Skip to content

Commit 3f4dfd9

Browse files
authored
Merge pull request #45 from zeroseven/v1.0.x
2 parents 1fd8adf + d5eb8d6 commit 3f4dfd9

File tree

3 files changed

+15
-17
lines changed

3 files changed

+15
-17
lines changed

.github/workflows/Test.yml

+6-15
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,29 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
typo3: [ '^9.5.0', '^10.4.0', '^11.5.0' ]
14+
typo3: ['^10.4.33', '^11.5.20' ]
1515
php: [ '7.4' ]
1616
dependency-version: [ lowest, stable ]
1717
experimental: [ false ]
1818
include:
1919
- php: 7.2
20-
typo3: '^9.5.0'
20+
typo3: '^10.4.33'
2121
dependency-version: stable
2222
experimental: false
2323
- php: 7.3
24-
typo3: '^9.5.0'
25-
dependency-version: stable
26-
experimental: false
27-
- php: 7.2
28-
typo3: '^10.4.0'
29-
dependency-version: stable
30-
experimental: false
31-
- php: 7.3
32-
typo3: '^10.4.0'
24+
typo3: '^10.4.33'
3325
dependency-version: stable
3426
experimental: false
3527
- php: 8.0
36-
typo3: '^11.5.0'
28+
typo3: '^11.5.20'
3729
dependency-version: stable
3830
experimental: false
3931
- php: 8.1
40-
typo3: '^11.5.0'
32+
typo3: '^11.5.20'
4133
dependency-version: stable
4234
experimental: false
4335
- php: nightly
44-
typo3: '^11.5.0'
36+
typo3: '^11.5.20'
4537
dependency-version: stable
4638
experimental: true
4739

@@ -112,7 +104,6 @@ jobs:
112104
vendor/bin/typo3cms site:list | grep my-fancy-host
113105
114106
- name: BE Config Test
115-
if: ${{ matrix.typo3 != '^9.5.0' }}
116107
run: |
117108
rm -rf var/cache/*
118109
vendor/bin/typo3cms configuration:showlocal BE/explicitADmode --json | grep explicitAllow

composer.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"symfony/console": "^4.0 || ^5.0",
1111
"symfony/yaml": "^4.0 || ^5.0",
1212
"typo3/cms-composer-installers": "^2.0 || ^3.0 || ^4.0",
13-
"typo3/cms-core": "^9.5.31 || ^10.4.21 || ^11.5.1",
13+
"typo3/cms-core": "^9.5.38 || ^10.4.33 || ^11.5.20",
1414
"composer-runtime-api": "^2.1",
1515
"symfony/polyfill-php80": "^1.23.1"
1616
},
@@ -45,5 +45,12 @@
4545
"branch-alias": {
4646
"dev-main": "1.x-dev"
4747
}
48+
},
49+
"config": {
50+
"allow-plugins": {
51+
"typo3/cms-composer-installers": true,
52+
"typo3/class-alias-loader": true,
53+
"helhum/typo3-console-plugin": true
54+
}
4855
}
4956
}

src/Typo3SiteConfiguration.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function load(string $siteIdentifier): array
4141
* @param array $configuration
4242
* @throws \TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException
4343
*/
44-
public function write(string $siteIdentifier, array $configuration): void
44+
public function write(string $siteIdentifier, array $configuration, bool $protectPlaceholders = false): void
4545
{
4646
$fileName = $this->configPath . '/' . $siteIdentifier . '/' . $this->configFileName;
4747
if (!file_exists($fileName)) {

0 commit comments

Comments
 (0)