Properly emulate LDAP delete attributes

DirectoryTree/LdapRecord#291

Author: stevebauman

src/Testing/Emulated/EmulatesModelQueries.php

@@ -77,9 +77,15 @@ public function deleteAttributes($dn, array $attributes)
         if (! $model = $this->find($dn)) {
             return false;
         }
-
-        foreach ($attributes as $attribute) {
-            $model->{$attribute} = null;
+        
+        foreach ($attributes as $attribute => $value) {
+            if (empty($value)) {
+                $model->{$attribute} = null;
+            } elseif (Arr::exists($model->{$attribute} ?? [], $attribute)) {
+                $model->{$attribute} = array_values(
+                    array_diff($model->{$attribute}, (array) $value)
+                );
+            }
         }
 
         return $model->save();

tests/Feature/Emulator/EmulatedModelQueryTest.php

@@ -109,6 +109,29 @@ public function test_delete()
         $this->assertNull(TestModelStub::find($model->getDn()));
     }
 
+    public function test_delete_attribute()
+    {
+        $model = tap(new TestModelStub, function ($model) {
+            $model->cn = 'John Doe';
+            $model->foo = 'bar';
+            $model->baz = 'set';
+            $model->zal = 'ze';
+            $model->save();
+        });
+
+        $model->deleteAttribute('foo');
+        $model->deleteAttribute(['baz', 'zal' => 'invalid']);
+
+        $this->assertNull($model->foo);
+        $this->assertNull($model->baz);
+        $this->assertEquals(['ze'], $model->zal);
+        $this->assertEquals('John Doe', $model->cn[0]);
+
+        $model->deleteAttribute(['baz', 'zal' => 'ze']);
+
+        $this->assertEquals([], $model->zal);
+    }
+
     public function test_delete_attributes()
     {
         $model = tap(new TestModelStub, function ($model) {
@@ -122,7 +145,7 @@ public function test_delete_attributes()
         $this->assertEquals(['bar'], $model->foo);
         $this->assertEquals(['set'], $model->baz);
 
-        $model->deleteAttributes($model->getDn(), ['foo', 'baz']);
+        $model->deleteAttributes($model->getDn(), ['foo' => [], 'baz' => []]);
 
         $model = TestModelStub::find($model->getDn());
         $this->assertNull($model->foo);
@@ -232,8 +255,7 @@ public function test_get_only_returns_matching_object_classes()
     {
         TestModelStub::create(['cn' => ['John']]);
 
-        $model = new class extends Entry
-        {
+        $model = new class extends Entry {
             public static $objectClasses = ['three', 'four'];
         };
 
@@ -589,14 +611,12 @@ public function test_domain_scoping()
         DirectoryEmulator::setup('alpha');
         DirectoryEmulator::setup('bravo');
 
-        $alpha = new class extends Entry
-        {
+        $alpha = new class extends Entry {
             protected $connection = 'alpha';
             public static $objectClasses = ['one', 'two'];
         };
 
-        $bravo = new class extends Entry
-        {
+        $bravo = new class extends Entry {
             protected $connection = 'bravo';
             public static $objectClasses = ['one', 'two'];
         };