From 4b3e32e05e5016dfa7113dcf7f0c96a1f91d96e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sascha=20L=C3=B6ffler?= <lsascha@gmail.com>
Date: Sat, 17 Mar 2018 16:05:01 +0100
Subject: [PATCH] [TASK] Make VimeoRendererTest notice free
Resolves: #84441
Releases: master
Change-Id: Ie647b39e1c03a70cbc0d7bf0083fd5430142d578
Reviewed-on: https://review.typo3.org/56317
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>
---
.../core/Classes/Resource/Rendering/VimeoRenderer.php | 6 +++---
.../Tests/Unit/Resource/Rendering/VimeoRendererTest.php | 9 +++------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/typo3/sysext/core/Classes/Resource/Rendering/VimeoRenderer.php b/typo3/sysext/core/Classes/Resource/Rendering/VimeoRenderer.php
index 8dd6aed10b1c..274b93ce5331 100644
--- a/typo3/sysext/core/Classes/Resource/Rendering/VimeoRenderer.php
+++ b/typo3/sysext/core/Classes/Resource/Rendering/VimeoRenderer.php
@@ -119,10 +119,10 @@ class VimeoRenderer implements FileRendererInterface
$src = sprintf('https://player.vimeo.com/video/%s?%s', $videoId, implode('&', $urlParams));
$attributes = ['allowfullscreen'];
- if (is_array($options['additionalAttributes'])) {
+ if (isset($options['additionalAttributes']) && is_array($options['additionalAttributes'])) {
$attributes[] = GeneralUtility::implodeAttributes($options['additionalAttributes'], true, true);
}
- if (is_array($options['data'])) {
+ if (isset($options['data']) && is_array($options['data'])) {
array_walk($options['data'], function (&$value, $key) {
$value = 'data-' . htmlspecialchars($key) . '="' . htmlspecialchars($value) . '"';
});
@@ -134,7 +134,7 @@ class VimeoRenderer implements FileRendererInterface
if ((int)$height > 0) {
$attributes[] = 'height="' . (int)$height . '"';
}
- if (is_object($GLOBALS['TSFE']) && $GLOBALS['TSFE']->config['config']['doctype'] !== 'html5') {
+ if (isset($GLOBALS['TSFE']) && is_object($GLOBALS['TSFE']) && $GLOBALS['TSFE']->config['config']['doctype'] !== 'html5') {
$attributes[] = 'frameborder="0"';
}
foreach (['class', 'dir', 'id', 'lang', 'style', 'title', 'accesskey', 'tabindex', 'onclick'] as $key) {
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php b/typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php
index f1be8c8fc753..dfefbed28091 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php
@@ -1,4 +1,5 @@
<?php
+declare(strict_types = 1);
namespace TYPO3\CMS\Core\Tests\Unit\Resource\Rendering;
/*
@@ -18,17 +19,13 @@ use TYPO3\CMS\Core\Resource\File;
use TYPO3\CMS\Core\Resource\FileReference;
use TYPO3\CMS\Core\Resource\OnlineMedia\Helpers\VimeoHelper;
use TYPO3\CMS\Core\Resource\Rendering\VimeoRenderer;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
* Class VimeoRendererTest
*/
-class VimeoRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
+class VimeoRendererTest extends UnitTestCase
{
- /**
- * Subject is not notice free, disable E_NOTICES
- */
- protected static $suppressNotices = true;
-
/**
* @var VimeoRenderer|\PHPUnit_Framework_MockObject_MockObject
*/
--
GitLab