From 715946d48164701306b02573cd12580fb828336b Mon Sep 17 00:00:00 2001
From: Jan Helke <typo3@helke.de>
Date: Fri, 15 Jun 2018 11:50:40 +0200
Subject: [PATCH] [TASK] Make typo3/sysext/frontend/Tests/Unit/ContentObject
notice free
Releases: master
Resolves: #85263
Change-Id: I19e7a26ddf41d7b55dfd1890163364ffd2479e13
Reviewed-on: https://review.typo3.org/57220
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
---
.../ContentObject/CaseContentObject.php | 10 ++++++----
.../ContentObject/CaseContentObjectTest.php | 15 ++++++--------
.../ContentDataProcessorTest.php | 20 ++++++++++++-------
3 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/typo3/sysext/frontend/Classes/ContentObject/CaseContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/CaseContentObject.php
index 4d6a86cbfc5c..8023bb387b0e 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/CaseContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/CaseContentObject.php
@@ -31,17 +31,19 @@ class CaseContentObject extends AbstractContentObject
return '';
}
- $setCurrent = isset($conf['setCurrent.']) ? $this->cObj->stdWrap($conf['setCurrent'], $conf['setCurrent.']) : $conf['setCurrent'];
+ $setCurrent = isset($conf['setCurrent.'])
+ ? $this->cObj->stdWrap($conf['setCurrent'] ?? '', $conf['setCurrent.'])
+ : ($conf['setCurrent'] ?? null);
if ($setCurrent) {
$this->cObj->data[$this->cObj->currentValKey] = $setCurrent;
}
$key = isset($conf['key.']) ? $this->cObj->stdWrap($conf['key'], $conf['key.']) : $conf['key'];
- $key = (string)$conf[$key] !== '' ? $key : 'default';
+ $key = isset($conf[$key]) && (string)$conf[$key] !== '' ? $key : 'default';
// If no "default" property is available, then an empty string is returned
- if ($key === 'default' && $conf['default'] === null) {
+ if ($key === 'default' && !isset($conf['default'])) {
$theValue = '';
} else {
- $theValue = $this->cObj->cObjGetSingle($conf[$key], $conf[$key . '.'], $key);
+ $theValue = $this->cObj->cObjGetSingle($conf[$key], $conf[$key . '.'] ?? [], $key);
}
if (isset($conf['stdWrap.'])) {
$theValue = $this->cObj->stdWrap($theValue, $conf['stdWrap.']);
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php
index 3e53e88c83b0..a9742e7845f0 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php
@@ -1,4 +1,6 @@
<?php
+declare(strict_types = 1);
+
namespace TYPO3\CMS\Frontend\Tests\Unit\ContentObject;
/*
@@ -32,20 +34,15 @@ class CaseContentObjectTest extends UnitTestCase
*/
protected $resetSingletonInstances = true;
- /**
- * Subject is not notice free, disable E_NOTICES
- */
- protected static $suppressNotices = true;
-
/**
* @var CaseContentObject|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $subject = null;
+ protected $subject;
/**
* Set up
*/
- protected function setUp()
+ protected function setUp(): void
{
/** @var TypoScriptFrontendController $tsfe */
$tsfe = $this->getMockBuilder(TypoScriptFrontendController::class)
@@ -73,7 +70,7 @@ class CaseContentObjectTest extends UnitTestCase
/**
* @test
*/
- public function renderReturnsEmptyStringIfNoKeyMatchesAndIfNoDefaultObjectIsSet()
+ public function renderReturnsEmptyStringIfNoKeyMatchesAndIfNoDefaultObjectIsSet(): void
{
$conf = [
'key' => 'not existing'
@@ -84,7 +81,7 @@ class CaseContentObjectTest extends UnitTestCase
/**
* @test
*/
- public function renderReturnsContentFromDefaultObjectIfKeyDoesNotExist()
+ public function renderReturnsContentFromDefaultObjectIfKeyDoesNotExist(): void
{
$conf = [
'key' => 'not existing',
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentDataProcessorTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentDataProcessorTest.php
index 864b1432f525..7db588b9fb9e 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentDataProcessorTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentDataProcessorTest.php
@@ -1,4 +1,6 @@
<?php
+declare(strict_types = 1);
+
namespace TYPO3\CMS\Frontend\Tests\Unit\ContentObject;
/*
@@ -16,21 +18,22 @@ namespace TYPO3\CMS\Frontend\Tests\Unit\ContentObject;
use TYPO3\CMS\Frontend\ContentObject\ContentDataProcessor;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
use TYPO3\CMS\Frontend\Tests\Unit\ContentObject\Fixtures\DataProcessorFixture;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
* Testcase for TYPO3\CMS\Frontend\ContentObject\ContentDataProcessor
*/
-class ContentDataProcessorTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
+class ContentDataProcessorTest extends UnitTestCase
{
/**
* @var ContentDataProcessor
*/
- protected $contentDataProcessor = null;
+ protected $contentDataProcessor;
/**
* Set up
*/
- protected function setUp()
+ protected function setUp(): void
{
$this->contentDataProcessor = new ContentDataProcessor();
}
@@ -38,7 +41,7 @@ class ContentDataProcessorTest extends \TYPO3\TestingFramework\Core\Unit\UnitTes
/**
* @test
*/
- public function throwsExceptionIfProcessorClassDoesNotExist()
+ public function throwsExceptionIfProcessorClassDoesNotExist(): void
{
$this->expectException(\UnexpectedValueException::class);
$this->expectExceptionCode(1427455378);
@@ -55,7 +58,7 @@ class ContentDataProcessorTest extends \TYPO3\TestingFramework\Core\Unit\UnitTes
/**
* @test
*/
- public function throwsExceptionIfProcessorClassDoesNotImplementInterface()
+ public function throwsExceptionIfProcessorClassDoesNotImplementInterface(): void
{
$this->expectException(\UnexpectedValueException::class);
$this->expectExceptionCode(1427455377);
@@ -72,7 +75,7 @@ class ContentDataProcessorTest extends \TYPO3\TestingFramework\Core\Unit\UnitTes
/**
* @test
*/
- public function processorIsCalled()
+ public function processorIsCalled(): void
{
$contentObjectRendererStub = new ContentObjectRenderer();
$config = [
@@ -82,6 +85,9 @@ class ContentDataProcessorTest extends \TYPO3\TestingFramework\Core\Unit\UnitTes
]
];
$variables = [];
- $this->assertSame(['foo' => 'bar'], $this->contentDataProcessor->process($contentObjectRendererStub, $config, $variables));
+ $this->assertSame(
+ ['foo' => 'bar'],
+ $this->contentDataProcessor->process($contentObjectRendererStub, $config, $variables)
+ );
}
}
--
GitLab