Merge branch 'pr/349' into develop

filamentphp · Apr 19, 2021 · bfa1e81 · bfa1e81
2 parents 69be890 + de89b34
commit bfa1e81
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/...RelationManager/Concerns/CanCallHooks.php → src/Resources/Concerns/CanCallHooks.php b/...RelationManager/Concerns/CanCallHooks.php → 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
@@ -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 @@ protected function authorize($action)
 
         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
@@ -5,13 +5,14 @@
 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
@@ -2,14 +2,15 @@
 
 namespace Filament\Resources\RelationManager;
 
+use Filament\Resources\Concerns\CanCallHooks;
 use Filament\Resources\Forms\Actions;
 use Filament\Resources\Forms\Form;
 use Filament\Resources\Forms\HasForm;
 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
@@ -3,14 +3,15 @@
 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;
 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
@@ -3,14 +3,15 @@
 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;
 use Livewire\Component;
 
 class ListRecords extends Component
 {
-    use Concerns\CanCallHooks;
+    use CanCallHooks;
     use HasTable;
 
     public $canAttach;