From 5f8d2b35a1b5b98b3d599caab52d1597af4d5478 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 11:26:39 +0100
Subject: [PATCH] [TASK] Make ResourceCompressorTest notice free

Resolves: #84406
Releases: master
Change-Id: I7d7004e2e53d5277ca611f397cc3dbae1c5cb823
Reviewed-on: https://review.typo3.org/56285
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Andreas Wolf <andreas.wolf@typo3.org>
Tested-by: Andreas Wolf <andreas.wolf@typo3.org>
---
 .../Classes/Resource/ResourceCompressor.php   |  4 +--
 .../Unit/Resource/ResourceCompressorTest.php  | 34 ++++++++-----------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/typo3/sysext/core/Classes/Resource/ResourceCompressor.php b/typo3/sysext/core/Classes/Resource/ResourceCompressor.php
index 0543b9bacf55..093adea2b830 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceCompressor.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceCompressor.php
@@ -130,7 +130,7 @@ public function concatenateCssFiles(array $cssFiles, array $options = [])
                 if (!isset($filesToIncludeByType[$type])) {
                     $filesToIncludeByType[$type] = [];
                 }
-                if ($fileOptions['forceOnTop']) {
+                if (!empty($fileOptions['forceOnTop'])) {
                     array_unshift($filesToIncludeByType[$type], $filenameFromMainDir);
                 } else {
                     $filesToIncludeByType[$type][] = $filenameFromMainDir;
@@ -179,7 +179,7 @@ public function concatenateJsFiles(array $jsFiles)
                 $filesToInclude[$fileOptions['section']] = [];
             }
             $filenameFromMainDir = $this->getFilenameFromMainDir($fileOptions['file']);
-            if ($fileOptions['forceOnTop']) {
+            if (!empty($fileOptions['forceOnTop'])) {
                 array_unshift($filesToInclude[$fileOptions['section']], $filenameFromMainDir);
             } else {
                 $filesToInclude[$fileOptions['section']][] = $filenameFromMainDir;
diff --git a/typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php b/typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php
index e040614b1627..e66fd8759ed0 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types = 1);
 namespace TYPO3\CMS\Core\Tests\Unit\Resource;
 
 /*
@@ -21,11 +22,6 @@
  */
 class ResourceCompressorTest extends BaseTestCase
 {
-    /**
-     * Subject is not notice free, disable E_NOTICES
-     */
-    protected static $suppressNotices = true;
-
     /**
      * @var ResourceCompressor|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
@@ -34,7 +30,7 @@ class ResourceCompressorTest extends BaseTestCase
     /**
      * Set up the test
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->subject = $this->getAccessibleMock(ResourceCompressor::class, ['compressCssFile', 'compressJsFile', 'createMergedCssFile', 'createMergedJsFile', 'getFilenameFromMainDir', 'checkBaseDirectory']);
@@ -43,7 +39,7 @@ protected function setUp()
     /**
      * @return array
      */
-    public function cssFixStatementsDataProvider()
+    public function cssFixStatementsDataProvider(): array
     {
         return [
             'nothing to do - no charset/import/namespace' => [
@@ -87,7 +83,7 @@ public function cssFixStatementsDataProvider()
      * @param string $input
      * @param string $expected
      */
-    public function cssFixStatementsMovesStatementsToTopIfNeeded($input, $expected)
+    public function cssFixStatementsMovesStatementsToTopIfNeeded($input, $expected): void
     {
         $result = $this->subject->_call('cssFixStatements', $input);
         $resultWithReadableLinefeed = str_replace(LF, 'LF', $result);
@@ -97,7 +93,7 @@ public function cssFixStatementsMovesStatementsToTopIfNeeded($input, $expected)
     /**
      * @test
      */
-    public function compressedCssFileIsFlaggedToNotCompressAgain()
+    public function compressedCssFileIsFlaggedToNotCompressAgain(): void
     {
         $fileName = 'fooFile.css';
         $compressedFileName = $fileName . '.gzip';
@@ -122,7 +118,7 @@ public function compressedCssFileIsFlaggedToNotCompressAgain()
     /**
      * @test
      */
-    public function compressedJsFileIsFlaggedToNotCompressAgain()
+    public function compressedJsFileIsFlaggedToNotCompressAgain(): void
     {
         $fileName = 'fooFile.js';
         $compressedFileName = $fileName . '.gzip';
@@ -147,7 +143,7 @@ public function compressedJsFileIsFlaggedToNotCompressAgain()
     /**
      * @test
      */
-    public function concatenatedCssFileIsFlaggedToNotConcatenateAgain()
+    public function concatenatedCssFileIsFlaggedToNotConcatenateAgain(): void
     {
         $fileName = 'fooFile.css';
         $concatenatedFileName = 'merged_' . $fileName;
@@ -172,7 +168,7 @@ public function concatenatedCssFileIsFlaggedToNotConcatenateAgain()
     /**
      * @test
      */
-    public function concatenatedCssFilesAreSeparatedByMediaType()
+    public function concatenatedCssFilesAreSeparatedByMediaType(): void
     {
         $allFileName = 'allFile.css';
         $screenFileName1 = 'screenFile.css';
@@ -215,7 +211,7 @@ public function concatenatedCssFilesAreSeparatedByMediaType()
     /**
      * @test
      */
-    public function concatenatedCssFilesObeyForceOnTopOption()
+    public function concatenatedCssFilesObeyForceOnTopOption(): void
     {
         $screen1FileName = 'screen1File.css';
         $screen2FileName = 'screen2File.css';
@@ -250,7 +246,7 @@ public function concatenatedCssFilesObeyForceOnTopOption()
     /**
      * @test
      */
-    public function concatenatedCssFilesObeyExcludeFromConcatenation()
+    public function concatenatedCssFilesObeyExcludeFromConcatenation(): void
     {
         $screen1FileName = 'screen1File.css';
         $screen2FileName = 'screen2File.css';
@@ -290,7 +286,7 @@ public function concatenatedCssFilesObeyExcludeFromConcatenation()
     /**
      * @test
      */
-    public function concatenatedJsFileIsFlaggedToNotConcatenateAgain()
+    public function concatenatedJsFileIsFlaggedToNotConcatenateAgain(): void
     {
         $fileName = 'fooFile.js';
         $concatenatedFileName = 'merged_' . $fileName;
@@ -315,7 +311,7 @@ public function concatenatedJsFileIsFlaggedToNotConcatenateAgain()
     /**
      * @return array
      */
-    public function calcStatementsDataProvider()
+    public function calcStatementsDataProvider(): array
     {
         return [
             'simple calc' => [
@@ -343,7 +339,7 @@ public function calcStatementsDataProvider()
      * @param string $input
      * @param string $expected
      */
-    public function calcFunctionMustRetainWhitespaces($input, $expected)
+    public function calcFunctionMustRetainWhitespaces($input, $expected): void
     {
         $result = $this->subject->_call('compressCssString', $input);
         $this->assertSame($expected, trim($result));
@@ -352,7 +348,7 @@ public function calcFunctionMustRetainWhitespaces($input, $expected)
     /**
      * @return array
      */
-    public function compressCssFileContentDataProvider()
+    public function compressCssFileContentDataProvider(): array
     {
         $path = dirname(__FILE__) . '/ResourceCompressorTest/Fixtures/';
         return [
@@ -392,7 +388,7 @@ public function compressCssFileContentDataProvider()
      * @param string $cssFile
      * @param string $expected
      */
-    public function compressCssFileContent($cssFile, $expected)
+    public function compressCssFileContent($cssFile, $expected): void
     {
         $cssContent = file_get_contents($cssFile);
         $compressedCss = $this->subject->_call('compressCssString', $cssContent);