[BUGFIX] Allow ItemProcessingService as param in MultipleItemsProcFunc (

#2144) Co-authored-by: Claus Due <claus@namelesscoder.net>
FluidTYPO3 · Dec 14, 2023 · 9232d18 · 9232d18
1 parent 437e4d1
commit 9232d18
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/Classes/Integration/MultipleItemsProcFunc.php b/Classes/Integration/MultipleItemsProcFunc.php
@@ -10,6 +10,7 @@
 
 use TYPO3\CMS\Backend\Form\FormDataProviderInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\DataHandling\ItemProcessingService;
 
 class MultipleItemsProcFunc
 {
@@ -32,7 +33,10 @@ public static function register(string $table, string $field, ?string $additiona
         $GLOBALS['TCA'][$table]['columns'][$field]['config']['itemsProcFunc'] = $newFunction;
     }
 
-    public function execute(array &$parameters, FormDataProviderInterface $formDataProvider): void
+    /**
+     * @param ItemProcessingService|FormDataProviderInterface $formDataProvider
+     */
+    public function execute(array &$parameters, $formDataProvider): void
     {
         $table = $parameters['table'];
         $field = $parameters['field'];

diff --git a/Tests/Unit/Integration/MultipleItemsProcFuncTest.php b/Tests/Unit/Integration/MultipleItemsProcFuncTest.php
@@ -11,6 +11,7 @@
 use FluidTYPO3\Flux\Integration\MultipleItemsProcFunc;
 use FluidTYPO3\Flux\Tests\Unit\AbstractTestCase;
 use TYPO3\CMS\Backend\Form\FormDataProviderInterface;
+use TYPO3\CMS\Core\DataHandling\ItemProcessingService;
 
 class MultipleItemsProcFuncTest extends AbstractTestCase
 {
@@ -29,12 +30,28 @@ public function testRegistersFunction(): void
         );
     }
 
-    public function testExecutesFunction(): void
+    public function testExecutesFunctionWithFormDataProvider(): void
     {
-        $provider = $this->getMockBuilder(FormDataProviderInterface::class)->getMockForAbstractClass();
+        static::$executed = false;
+        $formDataProviderInterface = $this->getMockBuilder(FormDataProviderInterface::class)->getMockForAbstractClass();
         MultipleItemsProcFunc::register('table', 'field', static::class . '->dummyFunction');
         $parameters = ['table' => 'table', 'field' => 'field'];
-        (new MultipleItemsProcFunc())->execute($parameters, $provider);
+        (new MultipleItemsProcFunc())->execute($parameters, $formDataProviderInterface);
+
+        self::assertTrue(static::$executed);
+    }
+
+    public function testExecutesFunctionWithItemProcessingService(): void
+    {
+        static::$executed = false;
+        if (!class_exists(ItemProcessingService::class)) {
+            $this->markTestSkipped('Skippped, class ' . ItemProcessingService::class . ' does not exist');
+        }
+        MultipleItemsProcFunc::register('table', 'field', static::class . '->dummyFunction');
+        $parameters = ['table' => 'table', 'field' => 'field'];
+        $itemProcessingServiceProvider = $this->getMockBuilder(ItemProcessingService::class)->getMockForAbstractClass();
+        (new MultipleItemsProcFunc())->execute($parameters, $itemProcessingServiceProvider);
+
         self::assertTrue(static::$executed);
     }