Rename incident bus

app/Bus/Commands/Incident/CreateIncidentCommand.php

@@ -12,12 +12,12 @@
 namespace CachetHQ\Cachet\Bus\Commands\Incident;
 
 /**
- * This is the report incident command.
+ * This is the create incident command.
  *
  * @author Joseph Cohen <joe@alt-three.com>
  * @author James Brooks <james@alt-three.com>
  */
-final class ReportIncidentCommand
+final class CreateIncidentCommand
 {
     /**
      * The incident name.
@@ -115,7 +115,7 @@ final class ReportIncidentCommand
     ];
 
     /**
-     * Create a new report incident command instance.
+     * Create a new create incident command instance.
      *
      * @param string      $name
      * @param int         $status

app/Bus/Commands/IncidentUpdate/CreateIncidentUpdateCommand.php

@@ -19,7 +19,7 @@ use CachetHQ\Cachet\Models\User;
  *
  * @author James Brooks <james@alt-three.com>
  */
-final class ReportIncidentUpdateCommand
+final class CreateIncidentUpdateCommand
 {
     /**
      * The incident.

app/Bus/Events/Incident/IncidentWasCreatedEvent.php

@@ -15,7 +15,7 @@ use CachetHQ\Cachet\Bus\Events\ActionInterface;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Models\User;
 
-final class IncidentWasReportedEvent implements ActionInterface, IncidentEventInterface
+final class IncidentWasCreatedEvent implements ActionInterface, IncidentEventInterface
 {
     /**
      * The user who reported the event.

app/Bus/Handlers/Commands/Incident/CreateIncidentCommandHandler.php

@@ -12,8 +12,8 @@
 namespace CachetHQ\Cachet\Bus\Handlers\Commands\Incident;
 
 use CachetHQ\Cachet\Bus\Commands\Component\UpdateComponentCommand;
-use CachetHQ\Cachet\Bus\Commands\Incident\ReportIncidentCommand;
-use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasReportedEvent;
+use CachetHQ\Cachet\Bus\Commands\Incident\CreateIncidentCommand;
+use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasCreatedEvent;
 use CachetHQ\Cachet\Bus\Exceptions\Incident\InvalidIncidentTimestampException;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Incident;
@@ -25,11 +25,11 @@ use Twig_Environment;
 use Twig_Loader_Array;
 
 /**
- * This is the report incident command handler.
+ * This is the create incident command handler.
  *
  * @author James Brooks <james@alt-three.com>
  */
-class ReportIncidentCommandHandler
+class CreateIncidentCommandHandler
 {
     /**
      * The authentication guard instance.
@@ -46,7 +46,7 @@ class ReportIncidentCommandHandler
     protected $dates;
 
     /**
-     * Create a new report incident command handler instance.
+     * Create a new create incident command handler instance.
      *
      * @param \Illuminate\Contracts\Auth\Guard            $auth
      * @param \CachetHQ\Cachet\Services\Dates\DateFactory $dates
@@ -60,13 +60,13 @@ class ReportIncidentCommandHandler
     }
 
     /**
-     * Handle the report incident command.
+     * Handle the create incident command.
      *
-     * @param \CachetHQ\Cachet\Bus\Commands\Incident\ReportIncidentCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Incident\CreateIncidentCommand $command
      *
      * @return \CachetHQ\Cachet\Models\Incident
      */
-    public function handle(ReportIncidentCommand $command)
+    public function handle(CreateIncidentCommand $command)
     {
         $data = [
             'name'     => $command->name,
@@ -116,7 +116,7 @@ class ReportIncidentCommandHandler
             ));
         }
 
-        event(new IncidentWasReportedEvent($this->auth->user(), $incident, (bool) $command->notify));
+        event(new IncidentWasCreatedEvent($this->auth->user(), $incident, (bool) $command->notify));
 
         return $incident;
     }
@@ -125,11 +125,11 @@ class ReportIncidentCommandHandler
      * Compiles an incident template into an incident message.
      *
      * @param \CachetHQ\Cachet\Models\IncidentTemplate                     $template
-     * @param \CachetHQ\Cachet\Bus\Commands\Incident\ReportIncidentCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\Incident\CreateIncidentCommand $command
      *
      * @return string
      */
-    protected function parseTemplate(IncidentTemplate $template, ReportIncidentCommand $command)
+    protected function parseTemplate(IncidentTemplate $template, CreateIncidentCommand $command)
     {
         $env = new Twig_Environment(new Twig_Loader_Array([]));
         $template = $env->createTemplate($template->template);

app/Bus/Handlers/Commands/IncidentUpdate/CreateIncidentUpdateCommandHandler.php

@@ -12,7 +12,7 @@
 namespace CachetHQ\Cachet\Bus\Handlers\Commands\IncidentUpdate;
 
 use CachetHQ\Cachet\Bus\Commands\Incident\UpdateIncidentCommand;
-use CachetHQ\Cachet\Bus\Commands\IncidentUpdate\ReportIncidentUpdateCommand;
+use CachetHQ\Cachet\Bus\Commands\IncidentUpdate\CreateIncidentUpdateCommand;
 use CachetHQ\Cachet\Bus\Events\IncidentUpdate\IncidentUpdateWasReportedEvent;
 use CachetHQ\Cachet\Models\IncidentUpdate;
 use Illuminate\Contracts\Auth\Guard;
@@ -22,7 +22,7 @@ use Illuminate\Contracts\Auth\Guard;
  *
  * @author James Brooks <james@alt-three.com>
  */
-class ReportIncidentUpdateCommandHandler
+class CreateIncidentUpdateCommandHandler
 {
     /**
      * The authentication guard instance.
@@ -46,11 +46,11 @@ class ReportIncidentUpdateCommandHandler
     /**
      * Handle the report incident command.
      *
-     * @param \CachetHQ\Cachet\Bus\Commands\IncidentUpdate\ReportIncidentUpdateCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\IncidentUpdate\CreateIncidentUpdateCommand $command
      *
      * @return \CachetHQ\Cachet\Models\IncidentUpdate
      */
-    public function handle(ReportIncidentUpdateCommand $command)
+    public function handle(CreateIncidentUpdateCommand $command)
     {
         $data = [
             'incident_id' => $command->incident->id,

app/Bus/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php

@@ -11,7 +11,7 @@
 
 namespace CachetHQ\Cachet\Bus\Handlers\Events\Incident;
 
-use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasReportedEvent;
+use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasCreatedEvent;
 use CachetHQ\Cachet\Models\Subscriber;
 use CachetHQ\Cachet\Notifications\Incident\NewIncidentNotification;
 
@@ -39,11 +39,11 @@ class SendIncidentEmailNotificationHandler
     /**
      * Handle the event.
      *
-     * @param \CachetHQ\Cachet\Bus\Events\Incident\IncidentWasReportedEvent $event
+     * @param \CachetHQ\Cachet\Bus\Events\Incident\IncidentWasCreatedEvent $event
      *
      * @return void
      */
-    public function handle(IncidentWasReportedEvent $event)
+    public function handle(IncidentWasCreatedEvent $event)
     {
         $incident = $event->incident;
 

app/Foundation/Providers/EventServiceProvider.php

@@ -60,12 +60,12 @@ class EventServiceProvider extends ServiceProvider
         'CachetHQ\Cachet\Bus\Events\IncidentUpdate\IncidentUpdateWasUpdatedEvent' => [
             //
         ],
+        'CachetHQ\Cachet\Bus\Events\Incident\IncidentWasCreatedEvent' => [
+            'CachetHQ\Cachet\Bus\Handlers\Events\Incident\SendIncidentEmailNotificationHandler',
+        ],
         'CachetHQ\Cachet\Bus\Events\Incident\IncidentWasRemovedEvent' => [
             //
         ],
-        'CachetHQ\Cachet\Bus\Events\Incident\IncidentWasReportedEvent' => [
-            'CachetHQ\Cachet\Bus\Handlers\Events\Incident\SendIncidentEmailNotificationHandler',
-        ],
         'CachetHQ\Cachet\Bus\Events\Incident\IncidentWasUpdatedEvent' => [
             //
         ],

app/Http/Controllers/Api/IncidentController.php

@@ -11,8 +11,8 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Api;
 
+use CachetHQ\Cachet\Bus\Commands\Incident\CreateIncidentCommand;
 use CachetHQ\Cachet\Bus\Commands\Incident\RemoveIncidentCommand;
-use CachetHQ\Cachet\Bus\Commands\Incident\ReportIncidentCommand;
 use CachetHQ\Cachet\Bus\Commands\Incident\UpdateIncidentCommand;
 use CachetHQ\Cachet\Models\Incident;
 use GrahamCampbell\Binput\Facades\Binput;
@@ -67,7 +67,7 @@ class IncidentController extends AbstractApiController
     public function postIncidents()
     {
         try {
-            $incident = dispatch(new ReportIncidentCommand(
+            $incident = dispatch(new CreateIncidentCommand(
                 Binput::get('name'),
                 Binput::get('status'),
                 Binput::get('message', null, false, false),

app/Http/Controllers/Api/IncidentUpdateController.php

@@ -11,8 +11,8 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Api;
 
+use CachetHQ\Cachet\Bus\Commands\IncidentUpdate\CreateIncidentUpdateCommand;
 use CachetHQ\Cachet\Bus\Commands\IncidentUpdate\RemoveIncidentUpdateCommand;
-use CachetHQ\Cachet\Bus\Commands\IncidentUpdate\ReportIncidentUpdateCommand;
 use CachetHQ\Cachet\Bus\Commands\IncidentUpdate\UpdateIncidentUpdateCommand;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Models\IncidentUpdate;
@@ -74,7 +74,7 @@ class IncidentUpdateController extends AbstractApiController
     public function postIncidentUpdate(Incident $incident)
     {
         try {
-            $update = dispatch(new ReportIncidentUpdateCommand(
+            $update = dispatch(new CreateIncidentUpdateCommand(
                 $incident,
                 Binput::get('status'),
                 Binput::get('message'),

app/Http/Controllers/Dashboard/IncidentController.php

@@ -12,10 +12,10 @@
 namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
 use AltThree\Validator\ValidationException;
+use CachetHQ\Cachet\Bus\Commands\Incident\CreateIncidentCommand;
 use CachetHQ\Cachet\Bus\Commands\Incident\RemoveIncidentCommand;
-use CachetHQ\Cachet\Bus\Commands\Incident\ReportIncidentCommand;
 use CachetHQ\Cachet\Bus\Commands\Incident\UpdateIncidentCommand;
-use CachetHQ\Cachet\Bus\Commands\IncidentUpdate\ReportIncidentUpdateCommand;
+use CachetHQ\Cachet\Bus\Commands\IncidentUpdate\CreateIncidentUpdateCommand;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\Incident;
@@ -108,7 +108,7 @@ class IncidentController extends Controller
     public function createIncidentAction()
     {
         try {
-            $incident = dispatch(new ReportIncidentCommand(
+            $incident = dispatch(new CreateIncidentCommand(
                 Binput::get('name'),
                 Binput::get('status'),
                 Binput::get('message', null, false, false),
@@ -308,7 +308,7 @@ class IncidentController extends Controller
     public function createIncidentUpdateAction(Incident $incident)
     {
         try {
-            $incident = dispatch(new ReportIncidentUpdateCommand(
+            $incident = dispatch(new CreateIncidentUpdateCommand(
                 $incident,
                 Binput::get('status'),
                 Binput::get('message'),

tests/Bus/Commands/Incident/CreateIncidentCommandTest.php

@@ -12,17 +12,17 @@
 namespace CachetHQ\Tests\Cachet\Bus\Commands\Incident;
 
 use AltThree\TestBench\CommandTrait;
-use CachetHQ\Cachet\Bus\Commands\Incident\ReportIncidentCommand;
-use CachetHQ\Cachet\Bus\Handlers\Commands\Incident\ReportIncidentCommandHandler;
+use CachetHQ\Cachet\Bus\Commands\Incident\CreateIncidentCommand;
+use CachetHQ\Cachet\Bus\Handlers\Commands\Incident\CreateIncidentCommandHandler;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
 
 /**
- * This is the add incident command test class.
+ * This is the create incident command test class.
  *
  * @author James Brooks <james@alt-three.com>
  * @author Graham Campbell <graham@alt-three.com>
  */
-class ReportIncidentCommandTest extends AbstractTestCase
+class CreateIncidentCommandTest extends AbstractTestCase
 {
     use CommandTrait;
 
@@ -42,7 +42,7 @@ class ReportIncidentCommandTest extends AbstractTestCase
             'template_vars'    => [],
         ];
 
-        $object = new ReportIncidentCommand(
+        $object = new CreateIncidentCommand(
             $params['name'],
             $params['status'],
             $params['message'],
@@ -66,6 +66,6 @@ class ReportIncidentCommandTest extends AbstractTestCase
 
     protected function getHandlerClass()
     {
-        return ReportIncidentCommandHandler::class;
+        return CreateIncidentCommandHandler::class;
     }
 }

tests/Bus/Commands/IncidentUpdate/CreateIncidentUpdateCommandTest.php

@@ -12,18 +12,18 @@
 namespace CachetHQ\Tests\Cachet\Bus\Commands\IncidentUpdate;
 
 use AltThree\TestBench\CommandTrait;
-use CachetHQ\Cachet\Bus\Commands\IncidentUpdate\ReportIncidentUpdateCommand;
-use CachetHQ\Cachet\Bus\Handlers\Commands\IncidentUpdate\ReportIncidentUpdateCommandHandler;
+use CachetHQ\Cachet\Bus\Commands\IncidentUpdate\CreateIncidentUpdateCommand;
+use CachetHQ\Cachet\Bus\Handlers\Commands\IncidentUpdate\CreateIncidentUpdateCommandHandler;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Models\User;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
 
 /**
- * This is the report incident update command test class.
+ * This is the create incident update command test class.
  *
  * @author James Brooks <james@alt-three.com>
  */
-class ReportIncidentUpdateCommandTest extends AbstractTestCase
+class CreateIncidentUpdateCommandTest extends AbstractTestCase
 {
     use CommandTrait;
 
@@ -35,7 +35,7 @@ class ReportIncidentUpdateCommandTest extends AbstractTestCase
             'message'  => 'Foo',
             'user'     => new User(),
         ];
-        $object = new ReportIncidentUpdateCommand($params['incident'], $params['status'], $params['message'], $params['user']);
+        $object = new CreateIncidentUpdateCommand($params['incident'], $params['status'], $params['message'], $params['user']);
 
         return compact('params', 'object');
     }
@@ -47,6 +47,6 @@ class ReportIncidentUpdateCommandTest extends AbstractTestCase
 
     protected function getHandlerClass()
     {
-        return ReportIncidentUpdateCommandHandler::class;
+        return CreateIncidentUpdateCommandHandler::class;
     }
 }

tests/Bus/Events/Incident/IncidentWasCreatedEventTest.php

@@ -11,16 +11,16 @@
 
 namespace CachetHQ\Tests\Cachet\Bus\Events\Incident;
 
-use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasReportedEvent;
+use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasCreatedEvent;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Models\User;
 
 /**
- * This is the incident was reported event test class.
+ * This is the incident was created event test class.
  *
  * @author James Brooks <james@alt-three.com>
  */
-class IncidentWasReportedEventTest extends AbstractIncidentEventTestCase
+class IncidentWasCreatedEventTest extends AbstractIncidentEventTestCase
 {
     protected function objectHasHandlers()
     {
@@ -34,7 +34,7 @@ class IncidentWasReportedEventTest extends AbstractIncidentEventTestCase
             'incident' => new Incident(),
             'notify'   => true,
         ];
-        $object = new IncidentWasReportedEvent($params['user'], $params['incident'], $params['notify']);
+        $object = new IncidentWasCreatedEvent($params['user'], $params['incident'], $params['notify']);
 
         return compact('params', 'object');
     }