From de89b3492da0ccd205581a43f77d2c408c3c7e70 Mon Sep 17 00:00:00 2001
From: Dan Pock <self@danpock.me>
Date: Wed, 14 Apr 2021 13:01:44 -0400
Subject: [PATCH] Refactor CanCallHooks to be more general as the same method
 is used on Page class

---
 .../{RelationManager => }/Concerns/CanCallHooks.php  |  2 +-
 src/Resources/Pages/Page.php                         | 12 +++---------
 src/Resources/RelationManager/AttachRecord.php       |  3 ++-
 src/Resources/RelationManager/CreateRecord.php       |  3 ++-
 src/Resources/RelationManager/EditRecord.php         |  3 ++-
 src/Resources/RelationManager/ListRecords.php        |  3 ++-
 6 files changed, 12 insertions(+), 14 deletions(-)
 rename src/Resources/{RelationManager => }/Concerns/CanCallHooks.php (76%)

diff --git a/src/Resources/RelationManager/Concerns/CanCallHooks.php b/src/Resources/Concerns/CanCallHooks.php
similarity index 76%
rename from src/Resources/RelationManager/Concerns/CanCallHooks.php
rename to src/Resources/Concerns/CanCallHooks.php
index 190a862177..2f87547f65 100644
--- a/src/Resources/RelationManager/Concerns/CanCallHooks.php
+++ b/src/Resources/Concerns/CanCallHooks.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Resources\RelationManager\Concerns;
+namespace Filament\Resources\Concerns;
 
 trait CanCallHooks
 {
diff --git a/src/Resources/Pages/Page.php b/src/Resources/Pages/Page.php
index f2e211ee1b..b1015521a3 100644
--- a/src/Resources/Pages/Page.php
+++ b/src/Resources/Pages/Page.php
@@ -2,11 +2,14 @@
 
 namespace Filament\Resources\Pages;
 
+use Filament\Resources\Concerns\CanCallHooks;
 use Filament\Resources\Route;
 use Illuminate\Support\Str;
 
 class Page extends \Filament\Pages\Page
 {
+    use CanCallHooks;
+
     public static $resource;
 
     public static function getModel()
@@ -39,13 +42,4 @@ class Page extends \Filament\Pages\Page
 
         abort_unless($this->{$method}() ?? true, 403);
     }
-
-    protected function callHook($hook)
-    {
-        if (! method_exists($this, $hook)) {
-            return;
-        }
-
-        $this->{$hook}();
-    }
 }
diff --git a/src/Resources/RelationManager/AttachRecord.php b/src/Resources/RelationManager/AttachRecord.php
index 0491bd43d0..3d8d8cb6ac 100644
--- a/src/Resources/RelationManager/AttachRecord.php
+++ b/src/Resources/RelationManager/AttachRecord.php
@@ -5,13 +5,14 @@ namespace Filament\Resources\RelationManager;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
 use Filament\Forms\HasForm;
+use Filament\Resources\Concerns\CanCallHooks;
 use Filament\Resources\Forms\Actions;
 use Illuminate\Support\Str;
 use Livewire\Component;
 
 class AttachRecord extends Component
 {
-    use Concerns\CanCallHooks;
+    use CanCallHooks;
     use HasForm;
 
     public $manager;
diff --git a/src/Resources/RelationManager/CreateRecord.php b/src/Resources/RelationManager/CreateRecord.php
index 23ebf9d628..55487e84cf 100644
--- a/src/Resources/RelationManager/CreateRecord.php
+++ b/src/Resources/RelationManager/CreateRecord.php
@@ -2,6 +2,7 @@
 
 namespace Filament\Resources\RelationManager;
 
+use Filament\Resources\Concerns\CanCallHooks;
 use Filament\Resources\Forms\Actions;
 use Filament\Resources\Forms\Form;
 use Filament\Resources\Forms\HasForm;
@@ -9,7 +10,7 @@ use Livewire\Component;
 
 class CreateRecord extends Component
 {
-    use Concerns\CanCallHooks;
+    use CanCallHooks;
     use HasForm;
 
     public $manager;
diff --git a/src/Resources/RelationManager/EditRecord.php b/src/Resources/RelationManager/EditRecord.php
index 6bc34a7007..7cba702229 100644
--- a/src/Resources/RelationManager/EditRecord.php
+++ b/src/Resources/RelationManager/EditRecord.php
@@ -3,6 +3,7 @@
 namespace Filament\Resources\RelationManager;
 
 use Filament\Filament;
+use Filament\Resources\Concerns\CanCallHooks;
 use Filament\Resources\Forms\Actions;
 use Filament\Resources\Forms\Form;
 use Filament\Resources\Forms\HasForm;
@@ -10,7 +11,7 @@ use Livewire\Component;
 
 class EditRecord extends Component
 {
-    use Concerns\CanCallHooks;
+    use CanCallHooks;
     use HasForm;
 
     public $manager;
diff --git a/src/Resources/RelationManager/ListRecords.php b/src/Resources/RelationManager/ListRecords.php
index 7f04fdabe6..c632d84d41 100644
--- a/src/Resources/RelationManager/ListRecords.php
+++ b/src/Resources/RelationManager/ListRecords.php
@@ -3,6 +3,7 @@
 namespace Filament\Resources\RelationManager;
 
 use Filament\Filament;
+use Filament\Resources\Concerns\CanCallHooks;
 use Filament\Resources\Tables\HasTable;
 use Filament\Resources\Tables\RecordActions;
 use Filament\Resources\Tables\Table;
@@ -10,7 +11,7 @@ use Livewire\Component;
 
 class ListRecords extends Component
 {
-    use Concerns\CanCallHooks;
+    use CanCallHooks;
     use HasTable;
 
     public $canAttach;