From 4a6fa2a6709339355e036ef944d53110accf80b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sascha=20L=C3=B6ffler?= <lsascha@gmail.com>
Date: Sat, 17 Mar 2018 13:38:06 +0100
Subject: [PATCH] [TASK] Make TaskTest notice free
Resolves: #84426
Releases: master
Change-Id: I2de52b5ddaacdfb9f8e29a11009ef7db3d9e1c46
Reviewed-on: https://review.typo3.org/56297
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
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>
---
typo3/sysext/extbase/Classes/Scheduler/Task.php | 2 +-
.../extbase/Tests/Unit/Scheduler/TaskTest.php | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/typo3/sysext/extbase/Classes/Scheduler/Task.php b/typo3/sysext/extbase/Classes/Scheduler/Task.php
index 614dfdc3a69e..384a289c9e43 100644
--- a/typo3/sysext/extbase/Classes/Scheduler/Task.php
+++ b/typo3/sysext/extbase/Classes/Scheduler/Task.php
@@ -178,7 +178,7 @@ class Task extends AbstractTask
if (!empty($this->arguments)) {
$arguments = [];
foreach ($this->arguments as $argumentName => $argumentValue) {
- if ($argumentValue != $this->defaults[$argumentName]) {
+ if (!isset($this->defaults[$argumentName]) || $argumentValue != $this->defaults[$argumentName]) {
$arguments[] = $argumentName . '=' . $argumentValue;
}
}
diff --git a/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php b/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php
index 34bb8e5a7631..baec05cfad41 100644
--- a/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php
@@ -1,4 +1,5 @@
<?php
+declare(strict_types = 1);
namespace TYPO3\CMS\Extbase\Tests\Unit\Scheduler;
/*
@@ -14,16 +15,15 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Scheduler;
* The TYPO3 project - inspiring people to share!
*/
+use TYPO3\CMS\Extbase\Scheduler\Task;
+use TYPO3\CMS\Extbase\Scheduler\TaskExecutor;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
+
/**
* Test case
*/
-class TaskTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
+class TaskTest extends UnitTestCase
{
- /**
- * Subject is not notice free, disable E_NOTICES
- */
- protected static $suppressNotices = true;
-
/**
* @var \TYPO3\CMS\Extbase\Scheduler\Task|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
*/
@@ -36,11 +36,11 @@ class TaskTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
protected function setUp()
{
- $this->taskExecutor = $this->getMockBuilder(\TYPO3\CMS\Extbase\Scheduler\TaskExecutor::class)
+ $this->taskExecutor = $this->getMockBuilder(TaskExecutor::class)
->setMethods(['execute'])
->disableOriginalConstructor()
->getMock();
- $this->task = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Scheduler\Task::class, ['logException', '__wakeup'], [], '', false);
+ $this->task = $this->getAccessibleMock(Task::class, ['logException', '__wakeup'], [], '', false);
}
/**
--
GitLab