Skip to content

Commit

Permalink
[TASK] Make TypolinkViewHelper notice free
Browse files Browse the repository at this point in the history
Releases: master
Resolves: #84373
Change-Id: I793ef881ef085c80f6c90a8281f6a88dcc56d642
Reviewed-on: https://review.typo3.org/56252
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
  • Loading branch information
janhelke authored and lolli42 committed Mar 16, 2018
1 parent 2d9cebb commit ed43671
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 17 deletions.
22 changes: 11 additions & 11 deletions typo3/sysext/fluid/Classes/ViewHelpers/Link/TypolinkViewHelper.php
Expand Up @@ -92,17 +92,17 @@ public function initializeArguments()
*/
public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
{
$parameter = $arguments['parameter'];
$target = $arguments['target'];
$class = $arguments['class'];
$title = $arguments['title'];
$additionalParams = $arguments['additionalParams'];
$additionalAttributes = $arguments['additionalAttributes'];
$useCacheHash = $arguments['useCacheHash'];
$addQueryString = $arguments['addQueryString'];
$addQueryStringMethod = $arguments['addQueryStringMethod'];
$addQueryStringExclude = $arguments['addQueryStringExclude'];
$absolute = $arguments['absolute'];
$parameter = $arguments['parameter'] ?? '';
$target = $arguments['target'] ?? '';
$class = $arguments['class'] ?? '';
$title = $arguments['title'] ?? '';
$additionalParams = $arguments['additionalParams'] ?? '';
$additionalAttributes = $arguments['additionalAttributes'] ?? [];
$useCacheHash = $arguments['useCacheHash'] ?? false;
$addQueryString = $arguments['addQueryString'] ?? false;
$addQueryStringMethod = $arguments['addQueryStringMethod'] ?? 'GET';
$addQueryStringExclude = $arguments['addQueryStringExclude'] ?? '';
$absolute = $arguments['absolute'] ?? false;

// Merge the $parameter with other arguments
$typolinkParameter = self::createTypolinkParameterArrayFromArguments($parameter, $target, $class, $title, $additionalParams);
Expand Down
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Link;

/*
Expand All @@ -16,6 +17,7 @@

use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
use TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture;
use TYPO3\CMS\Fluid\ViewHelpers\Link\TypolinkViewHelper;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
use TYPO3\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
Expand All @@ -25,11 +27,6 @@
*/
class TypolinkViewHelperTest extends ViewHelperBaseTestcase
{
/**
* Subject is not notice free, disable E_NOTICES
*/
protected static $suppressNotices = true;

/**
* @var TypolinkViewHelper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
*/
Expand All @@ -42,7 +39,7 @@ protected function setUp()
{
$this->subject = $this->getAccessibleMock(TypolinkViewHelper::class, ['renderChildren']);
/** @var RenderingContext $renderingContext */
$renderingContext = $this->createMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
$renderingContext = $this->createMock(RenderingContextFixture::class);
$this->subject->setRenderingContext($renderingContext);
}

Expand Down

0 comments on commit ed43671

Please sign in to comment.