Commit bf01303f authored by Christian Kuhn's avatar Christian Kuhn Committed by Georg Ringer
Browse files

[FOLLOWUP][TASK] PHP7 compliance - part 1

The fluid patch triggers funny effects at several
places, this part of the patch is reverted for now.

Change-Id: I8620116a89e48b855200fbc1e34b4c7a21052566
Resolves: #68194
Releases: master
Reviewed-on: http://review.typo3.org/41385


Reviewed-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Georg Ringer's avatarGeorg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer's avatarGeorg Ringer <georg.ringer@gmail.com>
parent 56dfb42d
......@@ -65,11 +65,10 @@ abstract class AbstractConditionViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHel
/**
* renders <f:then> child if $condition is true, otherwise renders <f:else> child.
*
* @param string $condition
* @return string the rendered string
* @api
*/
public function render($condition = '') {
public function render() {
if (static::evaluateCondition($this->arguments)) {
return $this->renderThenChild();
} else {
......
......@@ -70,8 +70,8 @@ class IfHasRoleViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractCondi
* @return string the rendered string
* @api
*/
public function render($role = '') {
return parent::render($role);
public function render($role) {
return parent::render();
}
/**
......
......@@ -86,11 +86,11 @@ class IfViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractConditionVie
/**
* renders <f:then> child if $condition is true, otherwise renders <f:else> child.
*
* @param string $condition View helper condition
* @param bool $condition View helper condition
* @return string the rendered string
* @api
*/
public function render($condition = '') {
return parent::render($condition);
public function render($condition) {
return parent::render();
}
}
......@@ -70,8 +70,8 @@ class IfHasRoleViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractCondi
* @return string the rendered string
* @api
*/
public function render($role = '') {
return parent::render($role);
public function render($role) {
return parent::render();
}
/**
......
......@@ -282,11 +282,10 @@ class DateViewHelperTest extends UnitTestCase {
/**
* @param string $locale
*/
protected function setLocale() {
$args = func_get_args();
setlocale(LC_CTYPE, $args[0]);
setlocale(LC_MONETARY, $args[0]);
setlocale(LC_TIME, $args[0]);
protected function setLocale($locale) {
setlocale(LC_CTYPE, $locale);
setlocale(LC_MONETARY, $locale);
setlocale(LC_TIME, $locale);
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment