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

jean-gui · jean-gui · commit afd02ff11b14 · 2018-04-04T18:47:24.000+02:00
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
@@ -70,14 +70,14 @@ 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
+     * @param Entry  $entry
+     * @param string $attribute
+     * @param array  $values
      *
      * @throws NotBoundException
      * @throws LdapException
      */
-    public function addValues(Entry $entry, $attribute, $values)
+    public function addAttributeValues(Entry $entry, string $attribute, array $values)
     {
         $con = $this->getConnectionResource();
 
@@ -90,14 +90,14 @@ public function addValues(Entry $entry, $attribute, $values)
     /**
      * Removes values from an entry's multi-valued attribute from the Ldap server.
      *
-     * @param Entry $entry
-     * @param $attribute
-     * @param $values
+     * @param Entry  $entry
+     * @param string $attribute
+     * @param array  $values
      *
      * @throws NotBoundException
      * @throws LdapException
      */
-    public function removeValues(Entry $entry, $attribute, $values)
+    public function removeAttributeValues(Entry $entry, string $attribute, array $values)
     {
         $con = $this->getConnectionResource();
 
diff --git a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php
@@ -193,29 +193,29 @@ public function testLdapRenameWithoutRemovingOldRdn()
         $this->executeSearchQuery(1);
     }
 
-    public function testLdapAddRemoveValues()
+    public function testLdapAddRemoveAttributeValues()
     {
         $entryManager = $this->adapter->getEntryManager();
 
         $result = $this->executeSearchQuery(1);
         $entry = $result[0];
 
-        $entryManager->addValues($entry, 'mail', array('fabpot@example.org', 'fabpot2@example.org'));
+        $entryManager->addAttributeValues($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'));
+        $entryManager->removeAttributeValues($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()
+    public function testLdapRemoveAttributeValuesError()
     {
         $entryManager = $this->adapter->getEntryManager();
 
@@ -224,10 +224,10 @@ public function testLdapRemoveValuesError()
 
         $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(LdapException::class);
 
-        $entryManager->removeValues($entry, 'mail', array('fabpot@example.org'));
+        $entryManager->removeAttributeValues($entry, 'mail', array('fabpot@example.org'));
     }
 
-    public function testLdapAddValuesError()
+    public function testLdapAddAttributeValuesError()
     {
         $entryManager = $this->adapter->getEntryManager();
 
@@ -236,6 +236,6 @@ public function testLdapAddValuesError()
 
         $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(LdapException::class);
 
-        $entryManager->addValues($entry, 'mail', $entry->getAttribute('mail'));
+        $entryManager->addAttributeValues($entry, 'mail', $entry->getAttribute('mail'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -193,29 +193,29 @@ public function testLdapRenameWithoutRemovingOldRdn()`
`193`	`193`	`$this->executeSearchQuery(1);`
`194`	`194`	`}`
`195`	`195`
`196`		`- public function testLdapAddRemoveValues()`
	`196`	`+ public function testLdapAddRemoveAttributeValues()`
`197`	`197`	`{`
`198`	`198`	`$entryManager = $this->adapter->getEntryManager();`
`199`	`199`
`200`	`200`	`$result = $this->executeSearchQuery(1);`
`201`	`201`	`$entry = $result[0];`
`202`	`202`
`203`		`- $entryManager->addValues($entry, 'mail', array('fabpot@example.org', 'fabpot2@example.org'));`
	`203`	`+ $entryManager->addAttributeValues($entry, 'mail', array('fabpot@example.org', 'fabpot2@example.org'));`
`204`	`204`
`205`	`205`	`$result = $this->executeSearchQuery(1);`
`206`	`206`	`$newEntry = $result[0];`
`207`	`207`
`208`	`208`	`$this->assertCount(4, $newEntry->getAttribute('mail'));`
`209`	`209`
`210`		`- $entryManager->removeValues($newEntry, 'mail', array('fabpot@example.org', 'fabpot2@example.org'));`
	`210`	`+ $entryManager->removeAttributeValues($newEntry, 'mail', array('fabpot@example.org', 'fabpot2@example.org'));`
`211`	`211`
`212`	`212`	`$result = $this->executeSearchQuery(1);`
`213`	`213`	`$newNewEntry = $result[0];`
`214`	`214`
`215`	`215`	`$this->assertCount(2, $newNewEntry->getAttribute('mail'));`
`216`	`216`	`}`
`217`	`217`
`218`		`- public function testLdapRemoveValuesError()`
	`218`	`+ public function testLdapRemoveAttributeValuesError()`
`219`	`219`	`{`
`220`	`220`	`$entryManager = $this->adapter->getEntryManager();`
`221`	`221`
`@@ -224,10 +224,10 @@ public function testLdapRemoveValuesError()`
`224`	`224`
`225`	`225`	`$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(LdapException::class);`
`226`	`226`
`227`		`- $entryManager->removeValues($entry, 'mail', array('fabpot@example.org'));`
	`227`	`+ $entryManager->removeAttributeValues($entry, 'mail', array('fabpot@example.org'));`
`228`	`228`	`}`
`229`	`229`
`230`		`- public function testLdapAddValuesError()`
	`230`	`+ public function testLdapAddAttributeValuesError()`
`231`	`231`	`{`
`232`	`232`	`$entryManager = $this->adapter->getEntryManager();`
`233`	`233`
`@@ -236,6 +236,6 @@ public function testLdapAddValuesError()`
`236`	`236`
`237`	`237`	`$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(LdapException::class);`
`238`	`238`
`239`		`- $entryManager->addValues($entry, 'mail', $entry->getAttribute('mail'));`
	`239`	`+ $entryManager->addAttributeValues($entry, 'mail', $entry->getAttribute('mail'));`
`240`	`240`	`}`
`241`	`241`	`}`