[CLEANUP] Use $this-> instead of parent:: in TS Conditions 17/38917/2
authorMarkus Klein <klein.t3@reelworx.at>
Sat, 25 Apr 2015 19:52:35 +0000 (21:52 +0200)
committerAndreas Fernandez <andreas.fernandez@aspedia.de>
Sun, 26 Apr 2015 12:12:56 +0000 (14:12 +0200)
The code for Backend and Frontend TS conditions
uses static calls to parent:: instead of using
$this->, which is common throughout the rest
of the TYPO3 Core.

Resolves: #64090
Releases: master, 6.2
Change-Id: I672e4828490732a16571de7dbbb6b3da64855222
Reviewed-on: http://review.typo3.org/38917
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
Reviewed-by: Franz Holzinger <franz@ttproducts.de>
Tested-by: Franz Holzinger <franz@ttproducts.de>
Reviewed-by: Andreas Fernandez <andreas.fernandez@aspedia.de>
Tested-by: Andreas Fernandez <andreas.fernandez@aspedia.de>
typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php

index d777f1e..903e449 100644 (file)
@@ -41,7 +41,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
         */
        protected function evaluateCondition($string) {
                list($key, $value) = GeneralUtility::trimExplode('=', $string, FALSE, 2);
-               $result = parent::evaluateConditionCommon($key, $value);
+               $result = $this->evaluateConditionCommon($key, $value);
                if (is_bool($result)) {
                        return $result;
                } else {
@@ -102,7 +102,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
         */
        protected function getVariable($var) {
                $vars = explode(':', $var, 2);
-               return parent::getVariableCommon($vars);
+               return $this->getVariableCommon($vars);
        }
 
        /**
index 70b0c52..d2985cf 100644 (file)
@@ -32,7 +32,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
         */
        protected function evaluateCondition($string) {
                list($key, $value) = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode('=', $string, FALSE, 2);
-               $result = parent::evaluateConditionCommon($key, $value);
+               $result = $this->evaluateConditionCommon($key, $value);
                if (is_bool($result)) {
                        return $result;
                } else {
@@ -85,7 +85,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
         */
        protected function getVariable($var) {
                $vars = explode(':', $var, 2);
-               $val = parent::getVariableCommon($vars);
+               $val = $this->getVariableCommon($vars);
                if (is_null($val)) {
                        $splitAgain = explode('|', $vars[1], 2);
                        $k = trim($splitAgain[0]);