[BUGFIX] Minor adjustments to wordings, variables and docs 93/58493/3
authorBenni Mack <benni@typo3.org>
Sun, 30 Sep 2018 11:57:50 +0000 (13:57 +0200)
committerBenni Mack <benni@typo3.org>
Sun, 30 Sep 2018 12:24:11 +0000 (14:24 +0200)
Resolves: #86473
Releases: master
Change-Id: I19f499533636b6a187adde51f2a4ca96149cc45f
Reviewed-on: https://review.typo3.org/58493
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: TYPO3com <no-reply@typo3.com>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
typo3/sysext/core/Classes/TypoScript/TemplateService.php

index fa7174f..1da9f32 100644 (file)
@@ -184,7 +184,7 @@ class SystemEnvironmentBuilder
      * @param int $entryPointLevel Number of subdirectories where the entry script is located under the document root
      * @param int $requestType
      */
-    protected static function definePaths($entryPointLevel = 0, int $requestType)
+    protected static function definePaths(int $entryPointLevel, int $requestType)
     {
         $isCli = self::isCliRequestType($requestType);
         // Absolute path of the entry script that was called
@@ -541,7 +541,7 @@ class SystemEnvironmentBuilder
      */
     protected static function defineLegacyConstants(string $mode)
     {
-        if (defined('TYPO3_MODE')) { // @todo remove once Bootstrap::getInstance()
+        if (defined('TYPO3_MODE')) { // @todo remove once Bootstrap::getInstance() is dropped
             return;
         }
         define('TYPO3_MODE', $mode);
index 3e9853a..423a455 100644 (file)
@@ -280,7 +280,7 @@ class TemplateService
     /**
      * Tracking all conditions found during parsing of TypoScript. Used for the "all" key in currentPageData
      *
-     * @var string
+     * @var array|null
      */
     public $sections;