Merge pull request #45 from zeroseven/v1.0.x

helhum · Dec 13, 2022 · 3f4dfd9 · 3f4dfd9
2 parents 1fd8adf + d5eb8d6
commit 3f4dfd9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
@@ -11,37 +11,29 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                typo3: [ '^9.5.0', '^10.4.0', '^11.5.0' ]
+                typo3: ['^10.4.33', '^11.5.20' ]
                 php: [ '7.4' ]
                 dependency-version: [ lowest, stable ]
                 experimental: [ false ]
                 include:
                     -   php: 7.2
-                        typo3: '^9.5.0'
+                        typo3: '^10.4.33'
                         dependency-version: stable
                         experimental: false
                     -   php: 7.3
-                        typo3: '^9.5.0'
-                        dependency-version: stable
-                        experimental: false
-                    -   php: 7.2
-                        typo3: '^10.4.0'
-                        dependency-version: stable
-                        experimental: false
-                    -   php: 7.3
-                        typo3: '^10.4.0'
+                        typo3: '^10.4.33'
                         dependency-version: stable
                         experimental: false
                     -   php: 8.0
-                        typo3: '^11.5.0'
+                        typo3: '^11.5.20'
                         dependency-version: stable
                         experimental: false
                     -   php: 8.1
-                        typo3: '^11.5.0'
+                        typo3: '^11.5.20'
                         dependency-version: stable
                         experimental: false
                     -   php: nightly
-                        typo3: '^11.5.0'
+                        typo3: '^11.5.20'
                         dependency-version: stable
                         experimental: true
 
@@ -112,7 +104,6 @@ jobs:
                     vendor/bin/typo3cms site:list | grep my-fancy-host
 
             -   name: BE Config Test
-                if: ${{ matrix.typo3 != '^9.5.0' }}
                 run: |
                     rm -rf var/cache/*
                     vendor/bin/typo3cms configuration:showlocal BE/explicitADmode --json | grep explicitAllow
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         "symfony/console": "^4.0 || ^5.0",
         "symfony/yaml": "^4.0 || ^5.0",
         "typo3/cms-composer-installers": "^2.0 || ^3.0 || ^4.0",
-        "typo3/cms-core": "^9.5.31 || ^10.4.21 || ^11.5.1",
+        "typo3/cms-core": "^9.5.38 || ^10.4.33 || ^11.5.20",
         "composer-runtime-api": "^2.1",
         "symfony/polyfill-php80": "^1.23.1"
     },
@@ -45,5 +45,12 @@
         "branch-alias": {
             "dev-main": "1.x-dev"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "typo3/cms-composer-installers": true,
+            "typo3/class-alias-loader": true,
+            "helhum/typo3-console-plugin": true
+        }
     }
 }
diff --git a/src/Typo3SiteConfiguration.php b/src/Typo3SiteConfiguration.php
@@ -41,7 +41,7 @@ public function load(string $siteIdentifier): array
      * @param array $configuration
      * @throws \TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException
      */
-    public function write(string $siteIdentifier, array $configuration): void
+    public function write(string $siteIdentifier, array $configuration, bool $protectPlaceholders = false): void
     {
         $fileName = $this->configPath . '/' . $siteIdentifier . '/' . $this->configFileName;
         if (!file_exists($fileName)) {