From 6a3b6a5e43f4c326814b02b666f6b1c591fd12a0 Mon Sep 17 00:00:00 2001
From: Susanne Moog <susanne.moog@typo3.org>
Date: Sun, 8 Apr 2018 10:24:07 +0200
Subject: [PATCH] [BUGFIX] Fix windows loading of site configuration
Due to different path handling, the path separators need
to be streamlined before using the path. Windows can handle
both / and \ but not in the same path.
Resolves: #84661
Releases: master
Change-Id: I138f0be68a9ffd017a840411bee92695b51e989d
Reviewed-on: https://review.typo3.org/56601
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
---
.../core/Classes/Configuration/SiteConfiguration.php | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/typo3/sysext/core/Classes/Configuration/SiteConfiguration.php b/typo3/sysext/core/Classes/Configuration/SiteConfiguration.php
index f444f40f5ae1..4fad0d110138 100644
--- a/typo3/sysext/core/Classes/Configuration/SiteConfiguration.php
+++ b/typo3/sysext/core/Classes/Configuration/SiteConfiguration.php
@@ -1,5 +1,6 @@
<?php
declare(strict_types = 1);
+
namespace TYPO3\CMS\Core\Configuration;
/*
@@ -86,7 +87,7 @@ class SiteConfiguration
$loader = GeneralUtility::makeInstance(YamlFileLoader::class);
$siteConfiguration = [];
foreach ($finder as $fileInfo) {
- $configuration = $loader->load((string)$fileInfo);
+ $configuration = $loader->load(GeneralUtility::fixWindowsFilePath((string)$fileInfo));
$identifier = basename($fileInfo->getPath());
$siteConfiguration[$identifier] = $configuration;
}
@@ -94,7 +95,7 @@ class SiteConfiguration
}
$sites = [];
foreach ($siteConfiguration ?? [] as $identifier => $configuration) {
- $rootPageId = (int)$configuration['site']['rootPageId'] ?? 0;
+ $rootPageId = (int)($configuration['site']['rootPageId'] ?? 0);
if ($rootPageId > 0) {
$sites[$identifier] = GeneralUtility::makeInstance(Site::class, $identifier, $rootPageId, $configuration['site']);
}
@@ -109,7 +110,7 @@ class SiteConfiguration
* @param array $configuration
* @throws \TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException
*/
- public function write(string $siteIdentifier, array $configuration)
+ public function write(string $siteIdentifier, array $configuration): void
{
$fileName = $this->configPath . '/' . $siteIdentifier . '/' . $this->configFileName;
if (!file_exists($fileName)) {
@@ -127,7 +128,7 @@ class SiteConfiguration
* @param string $newIdentifier
* @throws \TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException
*/
- public function rename(string $currentIdentifier, string $newIdentifier)
+ public function rename(string $currentIdentifier, string $newIdentifier): void
{
$result = rename($this->configPath . '/' . $currentIdentifier, $this->configPath . '/' . $newIdentifier);
if (!$result) {
@@ -143,7 +144,7 @@ class SiteConfiguration
* @param string $siteIdentifier
* @throws SiteNotFoundException
*/
- public function delete(string $siteIdentifier)
+ public function delete(string $siteIdentifier): void
{
$sites = $this->resolveAllExistingSites();
if (!isset($sites[$siteIdentifier])) {
--
GitLab