[TASK] Make usage of TYPO3_PATH_WEB failsafe

Using the TYPO3_PATH_WEB env var with a trailing
slash leads to failing unit/functional tests.

Trimming and appending a slash makes the usage
fail safe.

Releases: master
Resolves: #69124
Change-Id: I5048de4c9d35400c148cb5c40cf516d0d684b47a
Reviewed-on: http://review.typo3.org/42676
Reviewed-by: Helmut Hummel <helmut.hummel@typo3.org>
Tested-by: Helmut Hummel <helmut.hummel@typo3.org>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>

diff --git a/typo3/sysext/core/Build/FunctionalTestsBootstrap.php b/typo3/sysext/core/Build/FunctionalTestsBootstrap.php
index 61417d6..d396e2b 100644 (file)
--- a/typo3/sysext/core/Build/FunctionalTestsBootstrap.php
+++ b/typo3/sysext/core/Build/FunctionalTestsBootstrap.php
@@ -118,12 +118,11 @@ class FunctionalTestsBootstrap {
         */
        protected function getWebRoot() {
                if (getenv('TYPO3_PATH_WEB')) {
-                       $webRoot = getenv('TYPO3_PATH_WEB') . '/';
+                       $webRoot = getenv('TYPO3_PATH_WEB');
                } else {
-                       $webRoot = getcwd() . '/';
+                       $webRoot = getcwd();
                }
-
-               return strtr($webRoot, '\\', '/');
+               return rtrim(strtr($webRoot, '\\', '/'), '/') . '/';
        }
 }
 

diff --git a/typo3/sysext/core/Build/UnitTestsBootstrap.php b/typo3/sysext/core/Build/UnitTestsBootstrap.php
index 806cd64..e017900 100644 (file)
--- a/typo3/sysext/core/Build/UnitTestsBootstrap.php
+++ b/typo3/sysext/core/Build/UnitTestsBootstrap.php
@@ -105,12 +105,11 @@ class UnitTestsBootstrap {
         */
        protected function getWebRoot() {
                if (getenv('TYPO3_PATH_WEB')) {
-                       $webRoot = getenv('TYPO3_PATH_WEB') . '/';
+                       $webRoot = getenv('TYPO3_PATH_WEB');
                } else {
-                       $webRoot = getcwd() . '/';
+                       $webRoot = getcwd();
                }
-
-               return strtr($webRoot, '\\', '/');
+               return rtrim(strtr($webRoot, '\\', '/'), '/') . '/';
        }
 
        /**