Merge 7cd3c52 into 5463870

cakephp · Jun 1, 2020 · 2333463 · 2333463
2 parents 5463870 + 7cd3c52
commit 2333463
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/src/ORM/Table.php b/src/ORM/Table.php
@@ -2180,6 +2180,14 @@ public function saveManyOrFail(iterable $entities, $options = []): iterable
      */
     protected function _saveMany(iterable $entities, $options = []): iterable
     {
+        $options = new ArrayObject(
+            (array)$options + [
+                'atomic' => true,
+                'checkRules' => true,
+                '_primary' => true,
+            ]
+        );
+
         /** @var bool[] $isNew */
         $isNew = [];
         $cleanup = function ($entities) use (&$isNew): void {
@@ -2217,7 +2225,13 @@ protected function _saveMany(iterable $entities, $options = []): iterable
 
             throw new PersistenceFailedException($failed, ['saveMany']);
         }
-
+
+        if ($this->_transactionCommitted($options['atomic'], $options['_primary'])) {
+            foreach ($entities as $entity) {
+                $this->dispatchEvent('Model.afterSaveCommit', compact('entity', 'options'));
+            }
+        }
+
         return $entities;
     }
 

diff --git a/tests/TestCase/ORM/TableTest.php b/tests/TestCase/ORM/TableTest.php
@@ -2811,14 +2811,24 @@ public function testSaveManyArray()
             new Entity(['name' => 'dakota']),
         ];
 
-        $table = $this->getTableLocator()->get('authors');
+        $timesCalled = 0;
+        $listener = function ($e, $entity, $options) use (&$timesCalled) {
+            $timesCalled++;
+        };
+        $table = $this->getTableLocator()
+            ->get('authors');
+
+        $table->getEventManager()
+            ->on('Model.afterSaveCommit', $listener);
+
         $result = $table->saveMany($entities);
 
         $this->assertSame($entities, $result);
         $this->assertTrue(isset($result[0]->id));
         foreach ($entities as $entity) {
             $this->assertFalse($entity->isNew());
         }
+        $this->assertSame(2, $timesCalled);
     }
 
     /**