Allow adding and removing values to/from multi-valued attributes

jean-gui · jean-gui · commit 7a05d659976b · 2017-03-03T17:50:59.000+01:00
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
@@ -68,6 +68,47 @@ public function remove(Entry $entry)
         }
     }
 
+    /**
+     * Adds values to an entry's multi-valued attribute from the Ldap server.
+     *
+     * @param Entry $entry
+     * @param $attribute
+     * @param $values
+     *
+     * @throws NotBoundException
+     * @throws LdapException
+     */
+    public function addValues(Entry $entry, $attribute, $values)
+    {
+        $con = $this->getConnectionResource();
+
+        if (!@ldap_mod_add($con, $entry->getDn(), array($attribute => $values))) {
+            throw new LdapException(sprintf('Could not add values to entry "%s", attribute %s: %s', $entry->getDn(),
+                $attribute, ldap_error($con)));
+        }
+    }
+
+    /**
+     * Removes values from an entry's multi-valued attribute from the Ldap server.
+     *
+     * @param Entry $entry
+     * @param $attribute
+     * @param $values
+     *
+     * @throws NotBoundException
+     * @throws LdapException
+     */
+    public function removeValues(Entry $entry, $attribute, $values)
+    {
+        $con = $this->getConnectionResource();
+
+        if (!@ldap_mod_del($con, $entry->getDn(), array($attribute => $values))) {
+            throw new LdapException(sprintf('Could not remove values from entry "%s", attribute %s: %s',
+                $entry->getDn(),
+                $attribute, ldap_error($con)));
+        }
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php
@@ -192,4 +192,50 @@ public function testLdapRenameWithoutRemovingOldRdn()
 
         $this->executeSearchQuery(1);
     }
+
+    public function testLdapAddRemoveValues()
+    {
+        $entryManager = $this->adapter->getEntryManager();
+
+        $result = $this->executeSearchQuery(1);
+        $entry = $result[0];
+
+        $entryManager->addValues($entry, 'mail', array('fabpot@example.org', 'fabpot2@example.org'));
+
+        $result = $this->executeSearchQuery(1);
+        $newEntry = $result[0];
+
+        $this->assertCount(4, $newEntry->getAttribute('mail'));
+
+        $entryManager->removeValues($newEntry, 'mail', array('fabpot@example.org', 'fabpot2@example.org'));
+
+        $result = $this->executeSearchQuery(1);
+        $newNewEntry = $result[0];
+
+        $this->assertCount(2, $newNewEntry->getAttribute('mail'));
+    }
+
+    public function testLdapRemoveValuesError()
+    {
+        $entryManager = $this->adapter->getEntryManager();
+
+        $result = $this->executeSearchQuery(1);
+        $entry = $result[0];
+
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(LdapException::class);
+
+        $entryManager->removeValues($entry, 'mail', array('fabpot@example.org'));
+    }
+
+    public function testLdapAddValuesError()
+    {
+        $entryManager = $this->adapter->getEntryManager();
+
+        $result = $this->executeSearchQuery(1);
+        $entry = $result[0];
+
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(LdapException::class);
+
+        $entryManager->addValues($entry, 'mail', $entry->getAttribute('mail'));
+    }
 }
