Making route binding more unique to help with external conflicts (#403)

* Making route binding more unique to help with external conflicts

Author: qschmick

resources/views/tasks/form.blade.php

@@ -250,7 +250,7 @@
 @section('main-panel-footer')
     <button class="uk-button uk-button-primary uk-button-small" type="submit">Save</button>
     @if($task->exists)
-        <a href="{{ route('totem.task.view', $task) }}" class="uk-button uk-button-secondary uk-button-small">Cancel</a>
+        <a href="{{ route('totem.task.view', ['totemTask' => $task]) }}" class="uk-button uk-button-secondary uk-button-small">Cancel</a>
     @else
         <a href="{{ route('totem.tasks.all') }}" class="uk-button uk-button-secondary uk-button-small">Cancel</a>
     @endif

resources/views/tasks/index.blade.php

@@ -37,8 +37,8 @@ class="uk-search-input">
             @forelse($tasks as $task)
                 <tr is="task-row"
                     :data-task="{{$task}}"
-                    showHref="{{route('totem.task.view', $task)}}"
-                    executeHref="{{route('totem.task.execute', $task)}}">
+                    showHref="{{route('totem.task.view', ['totemTask' => $task])}}"
+                    executeHref="{{route('totem.task.execute', ['totemTask' => $task])}}">
                 </tr>
             @empty
                 <tr>

resources/views/tasks/view.blade.php

@@ -6,7 +6,7 @@
 @section('title')
     <div class="uk-flex uk-flex-between uk-flex-middle">
         <h5 class="uk-card-title uk-margin-remove">Task Details</h5>
-        <status-button :data-task="{{ $task }}" :data-exists="{{ $task->exists ? 'true' : 'false' }}" activate-url="{{route('totem.task.activate')}}" deactivate-url="{{route('totem.task.deactivate', $task)}}"></status-button>
+        <status-button :data-task="{{ $task }}" :data-exists="{{ $task->exists ? 'true' : 'false' }}" activate-url="{{route('totem.task.activate')}}" deactivate-url="{{route('totem.task.deactivate', ['totemTask' => $task])}}"></status-button>
     </div>
 @stop
 @section('main-panel-content')
@@ -86,15 +86,15 @@
 @section('main-panel-footer')
     <div class="uk-flex uk-flex-between uk-flex-middle">
         <span>
-            <a href="{{ route('totem.task.edit', $task) }}" class="uk-button uk-button-primary uk-button-small">Edit</a>
-            <form class="uk-display-inline" action="{{route('totem.task.delete', $task)}}" method="post">
+            <a href="{{ route('totem.task.edit', ['totemTask' => $task]) }}" class="uk-button uk-button-primary uk-button-small">Edit</a>
+            <form class="uk-display-inline" action="{{route('totem.task.delete', ['totemTask' => $task])}}" method="post">
                 {{ csrf_field() }}
                 {{ method_field('delete') }}
                 <button type="submit" class="uk-button uk-button-danger uk-button-small">Delete</button>
             </form>
             <a href="{{ route('totem.tasks.all') }}" class="uk-button uk-button-secondary uk-button-small">Cancel</a>
         </span>
-        <execute-button :data-task="{{ $task }}" url="{{route('totem.task.execute', $task)}}" button-class="uk-button-small uk-button-primary"></execute-button>
+        <execute-button :data-task="{{ $task }}" url="{{route('totem.task.execute', ['totemTask' => $task])}}" button-class="uk-button-small uk-button-primary"></execute-button>
     </div>
 @stop
 @section('additional-panels')

routes/web.php

@@ -18,15 +18,15 @@
     Route::get('export', 'ExportTasksController@index')->name('totem.tasks.export');
     Route::post('import', 'ImportTasksController@index')->name('totem.tasks.import');
 
-    Route::get('{task}', 'TasksController@view')->name('totem.task.view');
+    Route::get('{totemTask}', 'TasksController@view')->name('totem.task.view');
 
-    Route::get('{task}/edit', 'TasksController@edit')->name('totem.task.edit');
-    Route::post('{task}/edit', 'TasksController@update');
+    Route::get('{totemTask}/edit', 'TasksController@edit')->name('totem.task.edit');
+    Route::post('{totemTask}/edit', 'TasksController@update');
 
-    Route::delete('{task}', 'TasksController@destroy')->name('totem.task.delete');
+    Route::delete('{totemTask}', 'TasksController@destroy')->name('totem.task.delete');
 
     Route::post('status', 'ActiveTasksController@store')->name('totem.task.activate');
-    Route::delete('status/{id}', 'ActiveTasksController@destroy')->name('totem.task.deactivate');
+    Route::delete('status/{totemTask}', 'ActiveTasksController@destroy')->name('totem.task.deactivate');
 
-    Route::get('{task}/execute', 'ExecuteTasksController@index')->name('totem.task.execute');
+    Route::get('{totemTask}/execute', 'ExecuteTasksController@index')->name('totem.task.execute');
 });

src/Http/Controllers/TasksController.php

@@ -131,7 +131,7 @@ public function update(TaskRequest $request, Task $task): RedirectResponse
     {
         $task = $this->tasks->update($request->all(), $task);
 
-        return redirect()->route('totem.task.view', $task)
+        return redirect()->route('totem.task.view', ['totemTask' => $task])
             ->with('task', $task)
             ->with('success', trans('totem::messages.success.update'));
     }

src/Providers/TotemRouteServiceProvider.php

@@ -26,7 +26,7 @@ public function boot()
     {
         parent::boot();
 
-        Route::bind('task', function ($value) {
+        Route::bind('totemTask', function ($value) {
             return cache()->rememberForever('totem.task.'.$value, function () use ($value) {
                 return Task::find($value) ?? abort(404);
             });

tests/Feature/EditTaskTest.php

@@ -11,7 +11,7 @@ public function test_user_can_view_edit_task_form()
     {
         $this->disableExceptionHandling()->signIn();
         $task = Task::factory()->create();
-        $response = $this->get(route('totem.task.edit', $task));
+        $response = $this->get(route('totem.task.edit', ['totemTask' => $task]));
         $response->assertStatus(200);
         $response->assertSee($task->description);
         $response->assertSee($task->expression);
@@ -20,22 +20,22 @@ public function test_user_can_view_edit_task_form()
     public function test_guest_can_not_view_edit_task_form()
     {
         $task = Task::factory()->create();
-        $response = $this->get(route('totem.task.edit', $task));
+        $response = $this->get(route('totem.task.edit', ['totemTask' => $task]));
         $response->assertStatus(403);
     }
 
     public function test_user_can_edit_task()
     {
         $this->disableExceptionHandling()->signIn();
         $task = Task::factory()->create();
-        $response = $this->post(route('totem.task.edit', $task), [
+        $response = $this->post(route('totem.task.edit', ['totemTask' => $task]), [
             'description' => 'List All Scheduled Commands',
             'command' => 'Studio\Totem\Console\Commands\ListSchedule',
             'type' => 'cron',
             'expression' => '5 * * * *',
         ]);
 
         $response->assertSessionHas('task');
-        $response->assertRedirect(route('totem.task.view', $task));
+        $response->assertRedirect(route('totem.task.view', ['totemTask' => $task]));
     }
 }

tests/Feature/TaskExecutionTest.php

@@ -42,7 +42,7 @@ public function test_it_executes_a_scheduled_task()
         Event::fake();
 
         $this->signIn()
-            ->get(route('totem.task.execute', $task->id))
+            ->get(route('totem.task.execute', ['totemTask' => $task]))
             ->assertSuccessful();
 
         $this->assertEquals(1, Result::count());

tests/Feature/ViewTaskTest.php

@@ -11,7 +11,7 @@ public function test_user_can_view_task()
     {
         $this->signIn();
         $task = Task::factory()->create();
-        $response = $this->get(route('totem.task.view', $task));
+        $response = $this->get(route('totem.task.view', ['totemTask' => $task]));
         $response->assertStatus(200);
         $response->assertSee($task->description);
         $response->assertSee('Studio\Totem\Console\Commands\ListSchedule');
@@ -21,7 +21,7 @@ public function test_user_can_view_task()
     public function test_guest_can_not_view_task()
     {
         $task = Task::factory()->create();
-        $response = $this->get(route('totem.task.view', $task));
+        $response = $this->get(route('totem.task.view', ['totemTask' => $task]));
         $response->assertStatus(403);
     }
 }