Refactor controller into request handlers

8 files changed, 68 insertions, 12 deletions

diff --git a/resources/views/media-page-menu.phtml b/resources/views/media-page-menu.phtml
index 0b8024c982..9b22675667 100644
--- a/resources/views/media-page-menu.phtml
+++ b/resources/views/media-page-menu.phtml
@@ -3,7 +3,15 @@
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\Http\RequestHandlers\DeleteRecord;
 use Fisharebest\Webtrees\Http\RequestHandlers\EditRawRecordPage;
+use Fisharebest\Webtrees\Http\RequestHandlers\LinkMediaToFamilyModal;
+use Fisharebest\Webtrees\Http\RequestHandlers\LinkMediaToIndividualModal;
+use Fisharebest\Webtrees\Http\RequestHandlers\LinkMediaToSourceModal;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Media;
+
+/**
+ * @var Media $record
+ */
 
 ?>
 
@@ -14,17 +22,17 @@ use Fisharebest\Webtrees\I18N;
     </button>
 
     <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu">
-        <a class="dropdown-item" href="#" data-href="<?= e(route('link-media-to-individual', ['tree' => $record->tree()->name(), 'xref' => $record->xref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal" data-backdrop="static">
+        <a class="dropdown-item" href="#" data-href="<?= e(route(LinkMediaToIndividualModal::class, ['tree' => $record->tree()->name(), 'xref' => $record->xref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal" data-backdrop="static">
             <?= view('icons/link') ?>
             <?= I18N::translate('Link this media object to an individual') ?>
         </a>
 
-        <a class="dropdown-item" href="#" data-href="<?= e(route('link-media-to-family', ['tree' => $record->tree()->name(), 'xref' => $record->xref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal" data-backdrop="static">
+        <a class="dropdown-item" href="#" data-href="<?= e(route(LinkMediaToFamilyModal::class, ['tree' => $record->tree()->name(), 'xref' => $record->xref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal" data-backdrop="static">
             <?= view('icons/link') ?>
             <?= I18N::translate('Link this media object to a family') ?>
         </a>
 
-        <a class="dropdown-item" href="#" data-href="<?= e(route('link-media-to-source', ['tree' => $record->tree()->name(), 'xref' => $record->xref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal" data-backdrop="static">
+        <a class="dropdown-item" href="#" data-href="<?= e(route(LinkMediaToSourceModal::class, ['tree' => $record->tree()->name(), 'xref' => $record->xref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal" data-backdrop="static">
             <?= view('icons/link') ?>
             <?= I18N::translate('Link this media object to a source') ?>
         </a>
diff --git a/resources/views/media-page.phtml b/resources/views/media-page.phtml
index e03a93ae59..1631959149 100644
--- a/resources/views/media-page.phtml
+++ b/resources/views/media-page.phtml
@@ -4,8 +4,10 @@ use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\Functions\FunctionsPrint;
 use Fisharebest\Webtrees\Functions\FunctionsPrintFacts;
 use Fisharebest\Webtrees\GedcomTag;
+use Fisharebest\Webtrees\Http\RequestHandlers\AddMediaFileModal;
 use Fisharebest\Webtrees\Http\RequestHandlers\AddNewFact;
 use Fisharebest\Webtrees\Http\RequestHandlers\DeleteFact;
+use Fisharebest\Webtrees\Http\RequestHandlers\EditMediaFileModal;
 use Fisharebest\Webtrees\Http\RequestHandlers\PendingChangesAcceptRecord;
 use Fisharebest\Webtrees\Http\RequestHandlers\PendingChangesRejectRecord;
 use Fisharebest\Webtrees\I18N;
@@ -92,7 +94,7 @@ use Illuminate\Support\Collection;
                             <?= I18N::translate('Media file') ?>
                             <?php if ($media->canEdit()) : ?>
                                 <div class="editfacts nowrap">
-                                    <a class="btn btn-link" href="#" data-toggle="modal" data-backdrop="static" data-target="#wt-ajax-modal" data-href="<?= route('edit-media-file', ['tree' => $media->tree()->name(), 'xref' => $media->xref(), 'fact_id' => $media_file->factId()]) ?>" title="<?= I18N::translate('Edit') ?>">
+                                    <a class="btn btn-link" href="#" data-toggle="modal" data-backdrop="static" data-target="#wt-ajax-modal" data-href="<?= route(EditMediaFileModal::class, ['tree' => $media->tree()->name(), 'xref' => $media->xref(), 'fact_id' => $media_file->factId()]) ?>" title="<?= I18N::translate('Edit') ?>">
                                         <?= view('icons/edit') ?>
                                         <span class="sr-only">
                                         <?= I18N::translate('Edit') ?>
@@ -195,7 +197,7 @@ use Illuminate\Support\Collection;
                             <?= I18N::translate('Media file') ?>
                         </th>
                         <td>
-                            <a href="#" data-href="<?= e(route('add-media-file', ['tree' => $media->tree()->name(), 'xref' => $media->xref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal" data-backdrop="static">
+                            <a href="#" data-href="<?= e(route(AddMediaFileModal::class, ['tree' => $media->tree()->name(), 'xref' => $media->xref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal" data-backdrop="static">
                                 <?= I18N::translate('Add a media file') ?>
                             </a>
                         </td>
diff --git a/resources/views/modals/add-media-file.phtml b/resources/views/modals/add-media-file.phtml
index fdf5f47ac4..1ceb43c9a5 100644
--- a/resources/views/modals/add-media-file.phtml
+++ b/resources/views/modals/add-media-file.phtml
@@ -1,10 +1,20 @@
 <?php
 
+use Fisharebest\Webtrees\Http\RequestHandlers\AddMediaFileAction;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Media;
+use Fisharebest\Webtrees\Tree;
+
+/**
+ * @var string               $max_upload_size
+ * @var Media                $media
+ * @var Tree                 $tree
+ * @var array<string,string> $unused_files
+ */
 
 ?>
 
-<form method="post" action="<?= e(route('add-media-file', ['xref' => $media->xref(), 'tree' => $media->tree()->name()])) ?>" enctype="multipart/form-data">
+<form method="post" action="<?= e(route(AddMediaFileAction::class, ['xref' => $media->xref(), 'tree' => $media->tree()->name()])) ?>" enctype="multipart/form-data">
     <?= csrf_field() ?>
 
     <?= view('modals/header', ['title' => I18N::translate('Add a media file')]) ?>
diff --git a/resources/views/modals/create-media-from-file.phtml b/resources/views/modals/create-media-from-file.phtml
index 6afa89bd05..6ac3b43313 100644
--- a/resources/views/modals/create-media-from-file.phtml
+++ b/resources/views/modals/create-media-from-file.phtml
@@ -3,10 +3,11 @@
 use Fisharebest\Webtrees\GedcomTag;
 
 ?>
-<?php use Fisharebest\Webtrees\I18N; ?>
+<?php use Fisharebest\Webtrees\Http\RequestHandlers\CreateMediaObjectFromFile;
+use Fisharebest\Webtrees\I18N; ?>
 
 <div class="modal" id="modal-create-media-from-file">
-    <form method="post" action="<?= e(route('create-media-from-file')) ?>" id="modal-create-media-from-file-form">
+    <form method="post" action="<?= e(route(CreateMediaObjectFromFile::class)) ?>" id="modal-create-media-from-file-form">
         <?= csrf_field() ?>
         <input type="hidden" name="action" value="create-media-object-from-file">
         <input type="hidden" name="tree" id="tree" value="">
diff --git a/resources/views/modals/edit-media-file.phtml b/resources/views/modals/edit-media-file.phtml
index 100fbbb795..fb3347c4f3 100644
--- a/resources/views/modals/edit-media-file.phtml
+++ b/resources/views/modals/edit-media-file.phtml
@@ -1,10 +1,21 @@
 <?php
 
+use Fisharebest\Webtrees\Http\RequestHandlers\EditMediaFileAction;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Media;
+use Fisharebest\Webtrees\MediaFile;
+use Fisharebest\Webtrees\Tree;
+
+/**
+ * @var string    $max_upload_size
+ * @var Media     $media
+ * @var MediaFile $media_file
+ * @var Tree      $tree
+ */
 
 ?>
 
-<form method="post" action="<?= e(route('edit-media-file', ['xref' => $media->xref(), 'tree' => $media->tree()->name(), 'fact_id' => $media_file->factId()])) ?>" enctype="multipart/form-data">
+<form method="post" action="<?= e(route(EditMediaFileAction::class, ['xref' => $media->xref(), 'tree' => $media->tree()->name(), 'fact_id' => $media_file->factId()])) ?>" enctype="multipart/form-data">
     <?= csrf_field() ?>
 
     <?= view('modals/header', ['title' => I18N::translate('Edit a media file')]) ?>
diff --git a/resources/views/modals/link-media-to-family.phtml b/resources/views/modals/link-media-to-family.phtml
index 0d2d2fc498..5959b6401e 100644
--- a/resources/views/modals/link-media-to-family.phtml
+++ b/resources/views/modals/link-media-to-family.phtml
@@ -1,10 +1,18 @@
 <?php
 
+use Fisharebest\Webtrees\Http\RequestHandlers\LinkMediaToRecordAction;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Media;
+use Fisharebest\Webtrees\Tree;
+
+/**
+ * @var Media $media
+ * @var Tree $tree
+ */
 
 ?>
 
-<form method="post" action="<?= e(route('link-media-to-record', ['tree' => $tree->name(), 'xref' => $media->xref()])) ?>" id="wt-modal-form">
+<form method="post" action="<?= e(route(LinkMediaToRecordAction::class, ['tree' => $tree->name(), 'xref' => $media->xref()])) ?>" id="wt-modal-form">
     <?= csrf_field() ?>
 
     <?= view('modals/header', ['title' => I18N::translate('Link this media object to a family')]) ?>
diff --git a/resources/views/modals/link-media-to-individual.phtml b/resources/views/modals/link-media-to-individual.phtml
index b092c96cdf..dc9fcca5f5 100644
--- a/resources/views/modals/link-media-to-individual.phtml
+++ b/resources/views/modals/link-media-to-individual.phtml
@@ -1,10 +1,18 @@
 <?php
 
+use Fisharebest\Webtrees\Http\RequestHandlers\LinkMediaToRecordAction;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Media;
+use Fisharebest\Webtrees\Tree;
+
+/**
+ * @var Media $media
+ * @var Tree $tree
+ */
 
 ?>
 
-<form method="post" action="<?= e(route('link-media-to-record', ['tree' => $tree->name(), 'xref' => $media->xref()])) ?>" id="wt-modal-form">
+<form method="post" action="<?= e(route(LinkMediaToRecordAction::class, ['tree' => $tree->name(), 'xref' => $media->xref()])) ?>" id="wt-modal-form">
     <?= csrf_field() ?>
 
     <?= view('modals/header', ['title' => I18N::translate('Link this media object to an individual')]) ?>
diff --git a/resources/views/modals/link-media-to-source.phtml b/resources/views/modals/link-media-to-source.phtml
index acac353113..1cfa0fe95d 100644
--- a/resources/views/modals/link-media-to-source.phtml
+++ b/resources/views/modals/link-media-to-source.phtml
@@ -1,10 +1,18 @@
 <?php
 
+use Fisharebest\Webtrees\Http\RequestHandlers\LinkMediaToRecordAction;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Media;
+use Fisharebest\Webtrees\Tree;
+
+/**
+ * @var Media $media
+ * @var Tree $tree
+ */
 
 ?>
 
-<form method="post" action="<?= e(route('link-media-to-record', ['tree' => $tree->name(), 'xref' => $media->xref()])) ?>" id="wt-modal-form">
+<form method="post" action="<?= e(route(LinkMediaToRecordAction::class, ['tree' => $tree->name(), 'xref' => $media->xref()])) ?>" id="wt-modal-form">
     <?= csrf_field() ?>
 
     <?= view('modals/header', ['title' => I18N::translate('Link this media object to a source')]) ?>