Merge pull request #487 from oat-sa/fix/AUT-3700/spalt-operator-for-a…

…ssoc-array fix: splat operator for PHP 7.4
oat-sa · Jun 27, 2024 · 73c3527 · 73c3527
2 parents 596a191 + b4d3484
commit 73c3527
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/model/DataStore/DeliverySyncTask.php b/model/DataStore/DeliverySyncTask.php
@@ -40,7 +40,7 @@ class DeliverySyncTask extends AbstractAction implements JsonSerializable
     public function __invoke($params)
     {
         $report = new Report(Report::TYPE_SUCCESS);
-        $resourceSyncDTO = new ResourceSyncDTO(...$params[0]);
+        $resourceSyncDTO = new ResourceSyncDTO(...array_values($params[0]));
         $tryNumber = $params[1];
 
         if ($tryNumber < $resourceSyncDTO->getMaxTries()) {

diff --git a/test/unit/model/DataStore/DeliverySyncTaskTest.php b/test/unit/model/DataStore/DeliverySyncTaskTest.php
@@ -27,6 +27,7 @@
 use oat\generis\test\OntologyMockTrait;
 use oat\generis\test\TestCase;
 use oat\oatbox\reporting\Report;
+use oat\oatbox\service\exception\InvalidServiceManagerException;
 use oat\tao\model\featureFlag\FeatureFlagChecker;
 use oat\tao\model\featureFlag\FeatureFlagCheckerInterface;
 use oat\tao\model\metadata\compiler\ResourceJsonMetadataCompiler;
@@ -99,6 +100,9 @@ public function testJsonSerialize(): void
         );
     }
 
+    /**
+     * @throws InvalidServiceManagerException
+     */
     public function testInvoke()
     {
         $this->persistDataService->method('persist');
@@ -124,5 +128,15 @@ public function testInvoke()
         $expected = new Report(Report::TYPE_SUCCESS);
         $expected->setMessage('Success MetaData syncing for delivery: ' . $mockDelivery->getUri());
         $this->assertEquals($expected, $response);
+
+        try {
+            $subject = $this->subject;
+            $subject([
+                ['resourceId' => $mockDelivery->getUri(), 'fileSystemId' => 'dataStore'], // check assoc array
+                0
+            ]);
+        } catch (\Throwable $e) {
+            $this->fail(sprintf('Exception thrown during the task invoke %s', $e->getMessage()));
+        }
     }
 }