[TASK] Make CharsetConverterTest notice free

Resolves: #84366 Releases: master Change-Id: I0dcd7f4277c4576938dbb6b94adf5c40d6424dfe Reviewed-on: https://review.typo3.org/56248 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 · Mar 16, 2018 · 1264d81 · 1264d81
1 parent 6d274ee
commit 1264d81
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/typo3/sysext/core/Classes/Charset/CharsetConverter.php b/typo3/sysext/core/Classes/Charset/CharsetConverter.php
@@ -717,7 +717,7 @@ public function initUnicodeData($mode = null)
                 }
                 break;
             case 'ascii':
-                if (is_array($this->toASCII['utf-8'])) {
+                if (isset($this->toASCII['utf-8']) && is_array($this->toASCII['utf-8'])) {
                     return 1;
                 }
                 // Use cached version if possible

diff --git a/typo3/sysext/core/Tests/Unit/Charset/CharsetConverterTest.php b/typo3/sysext/core/Tests/Unit/Charset/CharsetConverterTest.php
@@ -24,11 +24,6 @@
  */
 class CharsetConverterTest extends UnitTestCase
 {
-    /**
-     * Subject is not notice free, disable E_NOTICES
-     */
-    protected static $suppressNotices = true;
-
     /**
      * Data provider for specialCharactersToAsciiConvertsUmlautsToAscii()
      *