From a21470b3ffb016467f13651328bfb3a19db55d7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Uzna=C5=84ski?= <l.uznanski@macopedia.pl>
Date: Sat, 17 Mar 2018 15:48:10 +0100
Subject: [PATCH] [TASK] Make SchemaColumnDefinitionListenerTest notice free
Resolves: #84440
Releases: master
Change-Id: Ibb1f891afffa3dd5bd7d06a32180ac1a47ce778e
Reviewed-on: https://review.typo3.org/56314
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Mathias Brodala <mbrodala@pagemachine.de>
Tested-by: Mathias Brodala <mbrodala@pagemachine.de>
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>
---
.../SchemaColumnDefinitionListener.php | 10 +++++-----
.../SchemaColumnDefinitionListenerTest.php | 17 ++++++-----------
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/typo3/sysext/core/Classes/Database/Schema/EventListener/SchemaColumnDefinitionListener.php b/typo3/sysext/core/Classes/Database/Schema/EventListener/SchemaColumnDefinitionListener.php
index d345d9af89e4..168a63096440 100644
--- a/typo3/sysext/core/Classes/Database/Schema/EventListener/SchemaColumnDefinitionListener.php
+++ b/typo3/sysext/core/Classes/Database/Schema/EventListener/SchemaColumnDefinitionListener.php
@@ -65,21 +65,21 @@ class SchemaColumnDefinitionListener
protected function getEnumerationTableColumnDefinition(array $tableColumn, AbstractPlatform $platform): Column
{
$options = [
- 'length' => $tableColumn['length'] ?: null,
+ 'length' => $tableColumn['length'] ?? null,
'unsigned' => false,
'fixed' => false,
- 'default' => $tableColumn['default'] ?: null,
- 'notnull' => (bool)($tableColumn['null'] !== 'YES'),
+ 'default' => $tableColumn['default'] ?? null,
+ 'notnull' => ($tableColumn['null'] ?? '') !== 'YES',
'scale' => null,
'precision' => null,
'autoincrement' => false,
- 'comment' => $tableColumn['comment'] ?: null,
+ 'comment' => $tableColumn['comment'] ?? null,
];
$dbType = $this->getDatabaseType($tableColumn['type']);
$doctrineType = $platform->getDoctrineTypeMapping($dbType);
- $column = new Column($tableColumn['field'], Type::getType($doctrineType), $options);
+ $column = new Column($tableColumn['field'] ?? null, Type::getType($doctrineType), $options);
$column->setPlatformOption('unquotedValues', $this->getUnquotedEnumerationValues($tableColumn['type']));
return $column;
diff --git a/typo3/sysext/core/Tests/Unit/Database/Schema/EventListener/SchemaColumnDefinitionListenerTest.php b/typo3/sysext/core/Tests/Unit/Database/Schema/EventListener/SchemaColumnDefinitionListenerTest.php
index 1fdac50f17b1..e15e4c1e82a7 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Schema/EventListener/SchemaColumnDefinitionListenerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Schema/EventListener/SchemaColumnDefinitionListenerTest.php
@@ -1,6 +1,5 @@
<?php
declare(strict_types = 1);
-
namespace TYPO3\CMS\Core\Tests\Unit\Database;
/*
@@ -26,17 +25,13 @@ use TYPO3\CMS\Core\Database\Schema\EventListener\SchemaColumnDefinitionListener;
use TYPO3\CMS\Core\Database\Schema\Types\EnumType;
use TYPO3\CMS\Core\Database\Schema\Types\SetType;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
* Test case
*/
-class SchemaColumnDefinitionListenerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
+class SchemaColumnDefinitionListenerTest extends UnitTestCase
{
- /**
- * Subject is not notice free, disable E_NOTICES
- */
- protected static $suppressNotices = true;
-
/**
* @var SchemaColumnDefinitionListener
*/
@@ -50,7 +45,7 @@ class SchemaColumnDefinitionListenerTest extends \TYPO3\TestingFramework\Core\Un
/**
* Set up the test subject
*/
- protected function setUp()
+ protected function setUp(): void
{
parent::setUp();
$this->subject = GeneralUtility::makeInstance(SchemaColumnDefinitionListener::class);
@@ -60,7 +55,7 @@ class SchemaColumnDefinitionListenerTest extends \TYPO3\TestingFramework\Core\Un
/**
* @test
*/
- public function isInactiveForStandardColumnTypes()
+ public function isInactiveForStandardColumnTypes(): void
{
$event = new SchemaColumnDefinitionEventArgs(
['Type' => 'int(11)'],
@@ -77,7 +72,7 @@ class SchemaColumnDefinitionListenerTest extends \TYPO3\TestingFramework\Core\Un
/**
* @test
*/
- public function buildsColumnForEnumDataType()
+ public function buildsColumnForEnumDataType(): void
{
if (Type::hasType('enum')) {
Type::overrideType('enum', EnumType::class);
@@ -105,7 +100,7 @@ class SchemaColumnDefinitionListenerTest extends \TYPO3\TestingFramework\Core\Un
/**
* @test
*/
- public function buildsColumnForSetDataType()
+ public function buildsColumnForSetDataType(): void
{
if (Type::hasType('set')) {
Type::overrideType('set', SetType::class);
--
GitLab