[BUGFIX] Replaced Deprecated PATH_site Constant, Updated Utility Func… (

FluidTYPO3#1657)
monosize · Jun 5, 2020 · 38752ac · 38752ac
1 parent ab6acc1
commit 38752ac
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/Classes/Service/AssetService.php b/Classes/Service/AssetService.php
@@ -640,7 +640,7 @@ protected function copyReferencedFilesAndReplacePaths($contents, $regex, $origin
                 $newPath = basename($path);
                 $extension = pathinfo($newPath, PATHINFO_EXTENSION);
                 $temporaryFileName = 'vhs-assets-css-' . $checksum . '.' . $extension;
-                $temporaryFile = constant('PATH_site') . $this->getTempPath() . $temporaryFileName;
+                $temporaryFile = CoreUtility::getSitePath() . $this->getTempPath() . $temporaryFileName;
                 $rawPath = GeneralUtility::getFileAbsFileName(
                     $originalDirectory . (empty($originalDirectory) ? '' : '/')
                 ) . $path;

diff --git a/Classes/Utility/CoreUtility.php b/Classes/Utility/CoreUtility.php
@@ -37,7 +37,8 @@ public static function getSitePath(): string
         if (defined('PATH_site')) {
             return constant('PATH_site');
         }
-        return Environment::getPublicPath();
+        /** @see https://docs.typo3.org/m/typo3/reference-coreapi/9.5/en-us/ApiOverview/GlobalValues/Constants/Index.html#path-site */
+        return Environment::getPublicPath() . '/';
     }
 
     /**

diff --git a/Classes/ViewHelpers/Media/Image/AbstractImageViewHelper.php b/Classes/ViewHelpers/Media/Image/AbstractImageViewHelper.php
@@ -233,7 +233,7 @@ protected function simulateFrontendEnvironment()
     {
         $this->tsfeBackup = true === isset($GLOBALS['TSFE']) ? $GLOBALS['TSFE'] : null;
         $this->workingDirectoryBackup = getcwd();
-        chdir(constant('PATH_site'));
+        chdir(CoreUtility::getSitePath());
         $typoScriptSetup = $this->configurationManager->getConfiguration(
             ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT
         );

diff --git a/Classes/ViewHelpers/Resource/AbstractImageViewHelper.php b/Classes/ViewHelpers/Resource/AbstractImageViewHelper.php
@@ -203,7 +203,7 @@ protected function simulateFrontendEnvironment()
         $template = GeneralUtility::makeInstance(TemplateService::class);
         $template->tt_track = 0;
         $template->init();
-        $template->getFileName_backPath = constant('PATH_site');
+        $template->getFileName_backPath = CoreUtility::getSitePath();
         $GLOBALS['TSFE']->tmpl = $template;
         $GLOBALS['TSFE']->tmpl->setup = $typoScriptSetup;
         $GLOBALS['TSFE']->config = $typoScriptSetup;