Add '_primary' flag to save options.

It's used to ensure 'afterSaveCommit' is not triggered for nested transactional saves.
cakephp · Feb 26, 2015 · 90845c4 · 90845c4
1 parent 5025c80
commit 90845c4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/src/ORM/Table.php b/src/ORM/Table.php
@@ -1333,7 +1333,8 @@ public function save(EntityInterface $entity, $options = [])
             'atomic' => true,
             'associated' => true,
             'checkRules' => true,
-            'checkExisting' => true
+            'checkExisting' => true,
+            '_primary' => true
         ]);
 
         if ($entity->errors()) {
@@ -1350,7 +1351,9 @@ public function save(EntityInterface $entity, $options = [])
                 return $this->_processSave($entity, $options);
             });
             if ($success) {
-                $this->dispatchEvent('Model.afterSaveCommit', compact('entity', 'options'));
+                if ($options['_primary']) {
+                    $this->dispatchEvent('Model.afterSaveCommit', compact('entity', 'options'));
+                }
                 $entity->isNew(false);
                 $entity->source($this->registryAlias());
             }
@@ -1398,7 +1401,7 @@ protected function _processSave($entity, $options)
             $this,
             $entity,
             $options['associated'],
-            $options->getArrayCopy()
+            ['_primary' => false] + $options->getArrayCopy()
         );
 
         if (!$saved && $options['atomic']) {
@@ -1419,7 +1422,7 @@ protected function _processSave($entity, $options)
                 $this,
                 $entity,
                 $options['associated'],
-                $options->getArrayCopy()
+                ['_primary' => false] + $options->getArrayCopy()
             );
             if ($success || !$options['atomic']) {
                 $entity->clean();

diff --git a/tests/TestCase/ORM/RulesCheckerIntegrationTest.php b/tests/TestCase/ORM/RulesCheckerIntegrationTest.php
@@ -461,7 +461,13 @@ public function testUseBeforeRules()
         $table->eventManager()->attach(
             function ($event, Entity $entity, \ArrayObject $options, $operation) {
                 $this->assertEquals(
-                    ['atomic' => true, 'associated' => true, 'checkRules' => true, 'checkExisting' => true],
+                    [
+                        'atomic' => true,
+                        'associated' => true,
+                        'checkRules' => true,
+                        'checkExisting' => true,
+                        '_primary' => true
+                    ],
                     $options->getArrayCopy()
                 );
                 $this->assertEquals('create', $operation);
@@ -494,7 +500,13 @@ public function testUseAfterRules()
         $table->eventManager()->attach(
             function ($event, Entity $entity, \ArrayObject $options, $result, $operation) {
                 $this->assertEquals(
-                    ['atomic' => true, 'associated' => true, 'checkRules' => true, 'checkExisting' => true],
+                    [
+                        'atomic' => true,
+                        'associated' => true,
+                        'checkRules' => true,
+                        'checkExisting' => true,
+                        '_primary' => true
+                    ],
                     $options->getArrayCopy()
                 );
                 $this->assertEquals('create', $operation);