remove deleting

ryanmitchell · Sep 25, 2024 · 4cc306d · 4cc306d
1 parent dfbab16
commit 4cc306d
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 128 deletions.
diff --git a/src/Events/CollectionTreeDeleting.php b/src/Events/CollectionTreeDeleting.php
diff --git a/src/Events/NavTreeDeleting.php b/src/Events/NavTreeDeleting.php
diff --git a/src/Structures/CollectionTree.php b/src/Structures/CollectionTree.php
@@ -6,7 +6,6 @@
 use Statamic\Contracts\Structures\CollectionTree as TreeContract;
 use Statamic\Contracts\Structures\CollectionTreeRepository;
 use Statamic\Events\CollectionTreeDeleted;
-use Statamic\Events\CollectionTreeDeleting;
 use Statamic\Events\CollectionTreeSaved;
 use Statamic\Events\CollectionTreeSaving;
 use Statamic\Facades\Blink;
@@ -57,11 +56,6 @@ protected function dispatchDeletedEvent()
         CollectionTreeDeleted::dispatch($this);
     }
 
-    protected function dispatchDeletingEvent()
-    {
-        return CollectionTreeDeleting::dispatch($this);
-    }
-
     public function collection()
     {
         return $this->structure()->collection();

diff --git a/src/Structures/NavTree.php b/src/Structures/NavTree.php
@@ -6,7 +6,6 @@
 use Statamic\Contracts\Structures\NavTree as TreeContract;
 use Statamic\Contracts\Structures\NavTreeRepository;
 use Statamic\Events\NavTreeDeleted;
-use Statamic\Events\NavTreeDeleting;
 use Statamic\Events\NavTreeSaved;
 use Statamic\Events\NavTreeSaving;
 use Statamic\Facades\Blink;
@@ -55,11 +54,6 @@ protected function dispatchDeletedEvent()
         NavTreeDeleted::dispatch($this);
     }
 
-    protected function dispatchDeletingEvent()
-    {
-        return NavTreeDeleting::dispatch($this);
-    }
-
     protected function repository()
     {
         return app(NavTreeRepository::class);

diff --git a/src/Structures/Tree.php b/src/Structures/Tree.php
@@ -176,10 +176,6 @@ public function save()
 
     public function delete()
     {
-        if ($this->dispatchDeletingEvent() === false) {
-            return false;
-        }
-
         Blink::forget('collection-structure-tree*');
 
         $this->repository()->delete($this);

diff --git a/tests/Data/Structures/CollectionTreeTest.php b/tests/Data/Structures/CollectionTreeTest.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Support\Facades\Event;
 use PHPUnit\Framework\Attributes\Test;
-use Statamic\Events\CollectionTreeDeleting;
 use Statamic\Events\CollectionTreeSaving;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Collection;
@@ -159,40 +158,4 @@ public function returning_false_in_collection_tree_saving_stops_saving()
 
         $this->assertFileDoesNotExist($tree->path());
     }
-
-    #[Test]
-    public function it_fires_a_deleting_event()
-    {
-        Event::fake();
-
-        $collection = Collection::make('test')->structureContents(['root' => true]);
-        Collection::shouldReceive('findByHandle')->with('test')->andReturn($collection);
-
-        $tree = $collection->structure()->makeTree('en');
-        $tree->save();
-
-        $tree->delete();
-
-        Event::assertDispatched(CollectionTreeDeleting::class);
-
-        $this->assertFileDoesNotExist($tree->path());
-    }
-
-    #[Test]
-    public function returning_false_in_nav_tree_deleting_stops_deleting()
-    {
-        Event::listen(CollectionTreeDeleting::class, function (CollectionTreeDeleting $event) {
-            return false;
-        });
-
-        $collection = Collection::make('test')->structureContents(['root' => true]);
-        Collection::shouldReceive('findByHandle')->with('test')->andReturn($collection);
-
-        $tree = $collection->structure()->makeTree('en');
-        $tree->save();
-
-        $tree->delete();
-
-        $this->assertFileExists($tree->path());
-    }
 }
diff --git a/tests/Data/Structures/NavTreeTest.php b/tests/Data/Structures/NavTreeTest.php
@@ -5,7 +5,6 @@
 use Facades\Statamic\Structures\BranchIds;
 use Illuminate\Support\Facades\Event;
 use PHPUnit\Framework\Attributes\Test;
-use Statamic\Events\NavTreeDeleting;
 use Statamic\Events\NavTreeSaving;
 use Statamic\Facades\Blink;
 use Statamic\Facades\File;
@@ -140,32 +139,4 @@ public function returning_false_in_nav_tree_saving_stops_saving()
 
         $this->assertFileDoesNotExist($tree->path());
     }
-
-    #[Test]
-    public function it_fires_a_deleting_event()
-    {
-        Event::fake();
-
-        $nav = tap(Nav::make('links'))->save();
-        $tree = tap($nav->makeTree('en', [['id' => 'the-id', 'title' => 'Branch']]))->save();
-
-        $tree->delete();
-
-        Event::assertDispatched(NavTreeDeleting::class);
-    }
-
-    #[Test]
-    public function returning_false_in_nav_tree_deleting_stops_deleting()
-    {
-        Event::listen(NavTreeDeleting::class, function (NavTreeDeleting $event) {
-            return false;
-        });
-
-        $nav = tap(Nav::make('links'))->save();
-        $tree = tap($nav->makeTree('en', [['id' => 'the-id', 'title' => 'Branch']]))->save();
-
-        $tree->delete();
-
-        $this->assertFileExists($tree->path());
-    }
 }