From cd210dd0b5a5969814573facb968e78f5e4338f5 Mon Sep 17 00:00:00 2001
From: Jan Helke <typo3@helke.de>
Date: Sat, 17 Mar 2018 09:37:50 +0100
Subject: [PATCH] [TASK] Make FormManagerControllerTest notice free
Releases: master
Resolves: #84394
Change-Id: I9c506e7f85fb1fc1c3e2108d485004911abe4daa
Reviewed-on: https://review.typo3.org/56269
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>
---
.../Controller/FormManagerController.php | 2 +-
.../Controller/FormManagerControllerTest.php | 26 ++++++++-----------
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/typo3/sysext/form/Classes/Controller/FormManagerController.php b/typo3/sysext/form/Classes/Controller/FormManagerController.php
index 15c7a41a8df1..01ba875dc4c1 100644
--- a/typo3/sysext/form/Classes/Controller/FormManagerController.php
+++ b/typo3/sysext/form/Classes/Controller/FormManagerController.php
@@ -323,7 +323,7 @@ class FormManagerController extends AbstractBackendController
$formManagerAppInitialData = ArrayUtility::reIndexNumericArrayKeysRecursive($formManagerAppInitialData);
$formManagerAppInitialData = TranslationService::getInstance()->translateValuesRecursive(
$formManagerAppInitialData,
- $this->formSettings['formManager']['translationFile']
+ $this->formSettings['formManager']['translationFile'] ?? null
);
return json_encode($formManagerAppInitialData);
}
diff --git a/typo3/sysext/form/Tests/Unit/Controller/FormManagerControllerTest.php b/typo3/sysext/form/Tests/Unit/Controller/FormManagerControllerTest.php
index b8fb4eb7d8c6..860faf834cf4 100644
--- a/typo3/sysext/form/Tests/Unit/Controller/FormManagerControllerTest.php
+++ b/typo3/sysext/form/Tests/Unit/Controller/FormManagerControllerTest.php
@@ -1,4 +1,5 @@
<?php
+declare(strict_types = 1);
namespace TYPO3\CMS\Form\Tests\Unit\Controller;
/*
@@ -33,11 +34,6 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
*/
class FormManagerControllerTest extends UnitTestCase
{
- /**
- * Subject is not notice free, disable E_NOTICES
- */
- protected static $suppressNotices = true;
-
/**
* @var array A backup of registered singleton instances
*/
@@ -54,7 +50,7 @@ class FormManagerControllerTest extends UnitTestCase
/**
* Tear down
*/
- public function tearDown()
+ public function tearDown(): void
{
GeneralUtility::resetSingletonInstances($this->singletonInstances);
parent::tearDown();
@@ -63,7 +59,7 @@ class FormManagerControllerTest extends UnitTestCase
/**
* @test
*/
- public function getAccessibleFormStorageFoldersReturnsProcessedArray()
+ public function getAccessibleFormStorageFoldersReturnsProcessedArray(): void
{
$mockController = $this->getAccessibleMock(FormManagerController::class, [
'dummy'
@@ -120,7 +116,7 @@ class FormManagerControllerTest extends UnitTestCase
/**
* @test
*/
- public function getFormManagerAppInitialDataReturnsProcessedArray()
+ public function getFormManagerAppInitialDataReturnsProcessedArray(): void
{
$objectManagerProphecy = $this->prophesize(ObjectManager::class);
GeneralUtility::setSingletonInstance(ObjectManager::class, $objectManagerProphecy->reveal());
@@ -193,7 +189,7 @@ class FormManagerControllerTest extends UnitTestCase
/**
* @test
*/
- public function getAvailableFormDefinitionsReturnsProcessedArray()
+ public function getAvailableFormDefinitionsReturnsProcessedArray(): void
{
$mockController = $this->getAccessibleMock(FormManagerController::class, [
'getReferences'
@@ -241,7 +237,7 @@ class FormManagerControllerTest extends UnitTestCase
/**
* @test
*/
- public function getProcessedReferencesRowsThrowsExceptionIfPersistenceIdentifierIsEmpty()
+ public function getProcessedReferencesRowsThrowsExceptionIfPersistenceIdentifierIsEmpty(): void
{
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionCode(1477071939);
@@ -312,7 +308,7 @@ class FormManagerControllerTest extends UnitTestCase
/**
* @test
*/
- public function isValidTemplatePathReturnsTrueIfTemplateIsDefinedAndExists()
+ public function isValidTemplatePathReturnsTrueIfTemplateIsDefinedAndExists(): void
{
$mockController = $this->getAccessibleMock(FormManagerController::class, [
'dummy'
@@ -345,7 +341,7 @@ class FormManagerControllerTest extends UnitTestCase
/**
* @test
*/
- public function isValidTemplatePathReturnsFalseIfTemplateIsDefinedButNotExists()
+ public function isValidTemplatePathReturnsFalseIfTemplateIsDefinedButNotExists(): void
{
$mockController = $this->getAccessibleMock(FormManagerController::class, [
'dummy'
@@ -378,7 +374,7 @@ class FormManagerControllerTest extends UnitTestCase
/**
* @test
*/
- public function isValidTemplatePathReturnsFalseIfTemplateIsNotDefinedAndExists()
+ public function isValidTemplatePathReturnsFalseIfTemplateIsNotDefinedAndExists(): void
{
$mockController = $this->getAccessibleMock(FormManagerController::class, [
'dummy'
@@ -421,7 +417,7 @@ class FormManagerControllerTest extends UnitTestCase
/**
* @test
*/
- public function convertFormNameToIdentifierRemoveSpaces()
+ public function convertFormNameToIdentifierRemoveSpaces(): void
{
$mockController = $this->getAccessibleMock(FormManagerController::class, [
'dummy'
@@ -435,7 +431,7 @@ class FormManagerControllerTest extends UnitTestCase
/**
* @test
*/
- public function convertFormNameToIdentifierRemoveSpecialChars()
+ public function convertFormNameToIdentifierRemoveSpecialChars(): void
{
$mockController = $this->getAccessibleMock(FormManagerController::class, [
'dummy'
--
GitLab