Merge branch '2.4' into mysql_unix_socket_support

app/Bus/Handlers/Commands/Schedule/CreateScheduleCommandHandler.php

@@ -92,7 +92,7 @@ protected function filter(CreateScheduleCommand $command)
         ];
 
         $availableParams = array_filter($params, function ($val) {
-            return $val !== null;
+            return $val !== null && $val !== '';
         });
 
         return $availableParams;

app/Http/Controllers/Dashboard/IncidentController.php

@@ -322,6 +322,6 @@ public function createIncidentUpdateAction(Incident $incident)
         }
 
         return cachet_redirect('dashboard.incidents')
-            ->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.incidents.delete.success')));
+            ->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.incidents.update.success')));
     }
 }

app/Models/Schedule.php

@@ -19,6 +19,11 @@
 use Illuminate\Database\Eloquent\Model;
 use McCool\LaravelAutoPresenter\HasPresenter;
 
+/**
+ * This is the schedule class.
+ *
+ * @author James Brooks <[email protected]>
+ */
 class Schedule extends Model implements HasPresenter
 {
     use SearchableTrait, SortableTrait, ValidatingTrait;
@@ -44,6 +49,16 @@ class Schedule extends Model implements HasPresenter
      */
     const COMPLETE = 2;
 
+    /**
+     * The model's attributes.
+     *
+     * @var string[]
+     */
+    protected $attributes = [
+        'status'       => self::UPCOMING,
+        'completed_at' => null,
+    ];
+
     /**
      * The attributes that should be casted to native types.
      *

app/Presenters/SchedulePresenter.php

@@ -206,11 +206,13 @@ public function completed_at_iso()
     /**
      * Formats the completed_at time ready to be used by bootstrap-datetimepicker.
      *
-     * @return string
+     * @return string|void
      */
     public function completed_at_datetimepicker()
     {
-        return $this->dates->make($this->wrappedObject->completed_at)->format('Y-m-d H:i');
+        if ($this->wrappedObject->completed_at) {
+            return $this->dates->make($this->wrappedObject->completed_at)->format('Y-m-d H:i');
+        }
     }
 
     /**

composer.json

@@ -105,7 +105,8 @@
         ]
     },
     "config": {
-        "preferred-install": "dist"
+        "preferred-install": "dist",
+        "sort-packages": true
     },
     "extra": {
         "branch-alias": {

resources/lang/en/dashboard.php

@@ -39,6 +39,7 @@
         'update' => [
             'title'    => 'Create new incident update',
             'subtitle' => 'Add an update to <strong>:incident</strong>',
+            'success'  => 'Update added.',
         ],
 
         // Incident templates

tests/Api/ScheduleTest.php

@@ -39,7 +39,7 @@ public function testGetSchedule()
 
         $this->assertResponseOk();
 
-        $this->seeJson($schedule->toArray());
+        $this->seeJson(['name' => $schedule->name]);
     }
 
     public function testCreateSchedule()