From d1d9b1790a63b98f0451fa1bf04514d0b945ce09 Mon Sep 17 00:00:00 2001
From: Fabian Galinski <fabian@sgalinski.de>
Date: Tue, 21 Jun 2016 20:10:23 +0200
Subject: [PATCH] [TASK] Remove compatibility code from a view helper
---
Classes/ViewHelpers/ExtendedIfViewHelper.php | 22 +-------------------
1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/Classes/ViewHelpers/ExtendedIfViewHelper.php b/Classes/ViewHelpers/ExtendedIfViewHelper.php
index 30c1812..26d0452 100644
--- a/Classes/ViewHelpers/ExtendedIfViewHelper.php
+++ b/Classes/ViewHelpers/ExtendedIfViewHelper.php
@@ -54,17 +54,7 @@ class ExtendedIfViewHelper extends AbstractConditionViewHelper {
$condition, $or = FALSE, $or2 = FALSE, $or3 = FALSE, $or4 = FALSE,
$and = TRUE, $and2 = TRUE, $and3 = TRUE, $and4 = TRUE, $negate = FALSE
) {
- if ($this->evaluateConditionFunctionExists()) {
- return parent::render();
- }
-
- // @todo Remove the following part if only > 7.5 support.
- $conditionResult = ($condition || $or || $or2 || $or3 || $or4) && $and && $and2 && $and3 && $and4;
- if ($negate ? !$conditionResult : $conditionResult) {
- return $this->renderThenChild();
- } else {
- return $this->renderElseChild();
- }
+ return parent::render();
}
/**
@@ -87,16 +77,6 @@ class ExtendedIfViewHelper extends AbstractConditionViewHelper {
return isset($arguments['negate']) && $arguments['negate'] ? !$conditionResult : $conditionResult;
}
-
- /**
- * Returns true, if the function evaluateCondition exists in the AbstractConditionViewHelper class.
- *
- * @deprecated Remove this function if only > 7.5 support.
- * @return boolean
- */
- protected function evaluateConditionFunctionExists() {
- return method_exists('TYPO3\CMS\Fluid\Core\ViewHelper\AbstractConditionViewHelper', 'evaluateCondition');
- }
}
?>
--
GitLab