Merge 4fe9a96 into a373495

cakephp · Feb 13, 2020 · 149cf90 · 149cf90
2 parents a373495 + 4fe9a96
commit 149cf90
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/src/ORM/Behavior/CounterCacheBehavior.php b/src/ORM/Behavior/CounterCacheBehavior.php
@@ -219,11 +219,24 @@ protected function _processAssociation(
         array $settings
     ): void {
         $foreignKeys = (array)$assoc->getForeignKey();
-        $primaryKeys = (array)$assoc->getBindingKey();
         $countConditions = $entity->extract($foreignKeys);
+        $allNulls = true;
+        foreach ($countConditions as $field => $value) {
+            if ($value === null) {
+                $countConditions[$field . ' IS'] = $value;
+                unset($countConditions[$field]);
+            } else {
+                $allNulls = false;
+            }
+        }
+        if ($allNulls) {
+            return;
+        }
+
+        $primaryKeys = (array)$assoc->getBindingKey();
         $updateConditions = array_combine($primaryKeys, $countConditions);
-        $countOriginalConditions = $entity->extractOriginalChanged($foreignKeys);
 
+        $countOriginalConditions = $entity->extractOriginalChanged($foreignKeys);
         if ($countOriginalConditions !== []) {
             $updateOriginalConditions = array_combine($primaryKeys, $countOriginalConditions);
         }

diff --git a/tests/TestCase/ORM/Behavior/CounterCacheBehaviorTest.php b/tests/TestCase/ORM/Behavior/CounterCacheBehaviorTest.php
@@ -175,6 +175,27 @@ public function testAddScope()
         $this->assertEquals(2, $after->get('posts_published'));
     }
 
+    /**
+     * @return void
+     */
+    public function testSaveWithNullForeignKey()
+    {
+        $this->comment->belongsTo('Users');
+
+        $this->comment->addBehavior('CounterCache', [
+            'Users' => [
+                'comment_count',
+            ],
+        ]);
+
+        $entity = new Entity([
+            'title' => 'Orphan comment',
+            'user_id' => null,
+        ]);
+        $this->comment->save($entity);
+        $this->assertTrue(true);
+    }
+
     /**
      * Testing simple counter caching when deleting a record
      *