[BUGFIX] Remove reset of GFX/processor_effects to -1 39/57339/2
authorMarc Willmann <mw@f7.de>
Fri, 22 Jun 2018 21:32:00 +0000 (23:32 +0200)
committerAndreas Wolf <andreas.wolf@typo3.org>
Sat, 23 Jun 2018 10:12:22 +0000 (12:12 +0200)
When entering the Install Tool and the GFX/processor is set to
GraphicsMagick the value for GFX/processor_effects is reset to -1,
overwriting any value that might have been set before.
Also adjust tests for the new expectations.

Resolves: #83591
Releases: master, 8.7
Change-Id: I7baa247a404166332a9a727983bb5eb83dfe37af
Reviewed-on: https://review.typo3.org/57339
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Andreas Wolf <andreas.wolf@typo3.org>
Tested-by: Andreas Wolf <andreas.wolf@typo3.org>
typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php
typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php

index b32d41e..a8e95d7 100644 (file)
@@ -473,11 +473,6 @@ class SilentConfigurationUpgradeService
             if ($currentProcessorMaskValue != 0) {
                 $changedValues['GFX/processor_allowTemporaryMasksAsPng'] = 0;
             }
-            if ($currentProcessorValue === 'GraphicsMagick') {
-                if ($currentProcessorEffectsValue != -1) {
-                    $changedValues['GFX/processor_effects'] = -1;
-                }
-            }
         }
         if (!empty($changedValues)) {
             $this->configurationManager->setLocalConfigurationValuesByPathValuePairs($changedValues);
index 2ff9168..cc08103 100644 (file)
@@ -549,8 +549,7 @@ class SilentConfigurationUpgradeServiceTest extends \TYPO3\TestingFramework\Core
         $this->configurationManager->expects($this->once())
             ->method('setLocalConfigurationValuesByPathValuePairs')
             ->withConsecutive(
-                [['GFX/processor_allowTemporaryMasksAsPng' => 0,
-                            'GFX/processor_effects' => -1]]
+                [['GFX/processor_allowTemporaryMasksAsPng' => 0]]
             );
 
         $this->expectException(RedirectException::class);