Merge pull request #6857 from cakephp/issue-6817

Treat [] and '' the same when saving belongsToMany associations.

src/ORM/Association/BelongsToMany.php

@@ -430,13 +430,13 @@ class BelongsToMany extends Association
         $targetEntity = $entity->get($this->property());
         $strategy = $this->saveStrategy();
 
-        if ($targetEntity === null) {
-            return false;
-        }
-
-        if ($targetEntity === [] && $entity->isNew()) {
+        $isEmpty = in_array($targetEntity, [null, [], '', false], true);
+        if ($isEmpty && $entity->isNew()) {
             return $entity;
         }
+        if ($isEmpty) {
+            $targetEntity = [];
+        }
 
         if ($strategy === self::SAVE_APPEND) {
             return $this->_saveTarget($entity, $targetEntity, $options);

tests/TestCase/ORM/Association/BelongsToManyTest.php

@@ -829,11 +829,27 @@ class BelongsToManyTest extends TestCase
     }
 
     /**
+     * Provider for empty values
+     *
+     * @return array
+     */
+    public function emptyProvider()
+    {
+        return [
+            [''],
+            [false],
+            [null],
+            [[]]
+        ];
+    }
+
+    /**
      * Test that saving an empty set on create works.
      *
+     * @dataProvider emptyProvider
      * @return void
      */
-    public function testSaveAssociatedEmptySetSuccess()
+    public function testSaveAssociatedEmptySetSuccess($value)
     {
         $assoc = $this->getMock(
             '\Cake\ORM\Association\BelongsToMany',
@@ -842,7 +858,7 @@ class BelongsToManyTest extends TestCase
         );
         $entity = new Entity([
             'id' => 1,
-            'tags' => []
+            'tags' => $value,
         ], ['markNew' => true]);
 
         $assoc->saveStrategy(BelongsToMany::SAVE_REPLACE);
@@ -854,6 +870,36 @@ class BelongsToManyTest extends TestCase
     }
 
     /**
+     * Test that saving an empty set on update works.
+     *
+     * @dataProvider emptyProvider
+     * @return void
+     */
+    public function testSaveAssociatedEmptySetUpdateSuccess($value)
+    {
+        $assoc = $this->getMock(
+            '\Cake\ORM\Association\BelongsToMany',
+            ['_saveTarget', 'replaceLinks'],
+            ['tags']
+        );
+        $entity = new Entity([
+            'id' => 1,
+            'tags' => $value,
+        ], ['markNew' => false]);
+
+        $assoc->saveStrategy(BelongsToMany::SAVE_REPLACE);
+        $assoc->expects($this->once())
+            ->method('replaceLinks')
+            ->with($entity, [])
+            ->will($this->returnValue(true));
+
+        $assoc->expects($this->never())
+            ->method('_saveTarget');
+
+        $this->assertSame($entity, $assoc->saveAssociated($entity));
+    }
+
+    /**
      * Tests saving with replace strategy returning true
      *
      * @return void