Merge pull request #2195 from CachetHQ/laravel-5.3-shift

Laravel 5.3 Shift
cachethq · Oct 22, 2016 · d501d85 · d501d85
2 parents d0dbf27 + e670f9b
commit d501d85
Show file tree

Hide file tree

Showing 74 changed files with 1,038 additions and 487 deletions.
diff --git a/app/Bus/Commands/Component/AddComponentCommand.php b/app/Bus/Commands/Component/AddComponentCommand.php
@@ -69,12 +69,12 @@ final class AddComponentCommand
      */
     public $rules = [
         'name'        => 'required|string',
-        'description' => 'string',
-        'status'      => 'int|min:1|max:4',
-        'link'        => 'url',
-        'order'       => 'int',
-        'group_id'    => 'int',
-        'enabled'     => 'bool',
+        'description' => 'required|string',
+        'status'      => 'required|int|min:1|max:4',
+        'link'        => 'nullable|url',
+        'order'       => 'nullable|int',
+        'group_id'    => 'nullable|int',
+        'enabled'     => 'nullable|bool',
     ];
 
     /**

diff --git a/app/Bus/Commands/Component/UpdateComponentCommand.php b/app/Bus/Commands/Component/UpdateComponentCommand.php
@@ -77,13 +77,13 @@ final class UpdateComponentCommand
      * @var string[]
      */
     public $rules = [
-        'name'        => 'string',
-        'description' => 'string',
-        'status'      => 'int|min:1|max:4',
-        'link'        => 'url',
-        'order'       => 'int',
-        'group_id'    => 'int',
-        'enabled'     => 'bool',
+        'name'        => 'nullable|string',
+        'description' => 'nullable|string',
+        'status'      => 'nullable|int|min:1|max:4',
+        'link'        => 'nullable|url',
+        'order'       => 'nullable|int',
+        'group_id'    => 'nullable|int',
+        'enabled'     => 'nullable|bool',
     ];
 
     /**

diff --git a/app/Bus/Commands/ComponentGroup/AddComponentGroupCommand.php b/app/Bus/Commands/ComponentGroup/AddComponentGroupCommand.php
@@ -53,9 +53,9 @@ final class AddComponentGroupCommand
      */
     public $rules = [
         'name'      => 'required|string',
-        'order'     => 'int',
-        'collapsed' => 'int|between:0,3',
-        'visible'   => 'bool',
+        'order'     => 'required|int',
+        'collapsed' => 'required|int|between:0,3',
+        'visible'   => 'required|bool',
     ];
 
     /**

diff --git a/app/Bus/Commands/ComponentGroup/UpdateComponentGroupCommand.php b/app/Bus/Commands/ComponentGroup/UpdateComponentGroupCommand.php
@@ -61,10 +61,10 @@ final class UpdateComponentGroupCommand
      * @var string[]
      */
     public $rules = [
-        'name'      => 'string',
-        'order'     => 'int',
-        'collapsed' => 'int|between:0,3',
-        'visible'   => 'bool',
+        'name'      => 'nullable|string',
+        'order'     => 'nullable|int',
+        'collapsed' => 'nullable|int|between:0,3',
+        'visible'   => 'nullable|bool',
     ];
 
     /**

diff --git a/app/Bus/Commands/Incident/ReportIncidentCommand.php b/app/Bus/Commands/Incident/ReportIncidentCommand.php
@@ -104,14 +104,14 @@ final class ReportIncidentCommand
     public $rules = [
         'name'             => 'required|string',
         'status'           => 'required|int|min:0|max:4',
-        'message'          => 'string',
-        'visible'          => 'bool',
-        'component_id'     => 'int|required_with:component_status',
-        'component_status' => 'int|min:1|max:4|required_with:component_id',
-        'notify'           => 'bool',
-        'stickied'         => 'bool',
-        'incident_date'    => 'string',
-        'template'         => 'string',
+        'message'          => 'required|string',
+        'visible'          => 'nullable|bool',
+        'component_id'     => 'nullable|required_with:component_status|int',
+        'component_status' => 'nullable|required_with:component_id|int|min:1|max:4',
+        'notify'           => 'nullable|bool',
+        'stickied'         => 'required|bool',
+        'incident_date'    => 'nullable|string',
+        'template'         => 'nullable|string',
     ];
 
     /**

diff --git a/app/Bus/Commands/Incident/ReportMaintenanceCommand.php b/app/Bus/Commands/Incident/ReportMaintenanceCommand.php
@@ -48,9 +48,9 @@ final class ReportMaintenanceCommand
      */
     public $rules = [
         'name'      => 'required|string',
-        'message'   => 'string',
-        'notify'    => 'bool',
-        'timestamp' => 'string',
+        'message'   => 'required|string',
+        'notify'    => 'nullable|bool',
+        'timestamp' => 'required|string',
     ];
 
     /**

diff --git a/app/Bus/Commands/Incident/UpdateIncidentCommand.php b/app/Bus/Commands/Incident/UpdateIncidentCommand.php
@@ -105,15 +105,15 @@ final class UpdateIncidentCommand
      * @var string[]
      */
     public $rules = [
-        'name'             => 'string',
-        'status'           => 'int|min:0|max:4',
-        'message'          => 'string',
-        'visible'          => 'bool',
-        'component_id'     => 'int',
-        'component_status' => 'int|min:1|max:4|required_with:component_id',
-        'notify'           => 'bool',
-        'stickied'         => 'bool',
-        'template'         => 'string',
+        'name'             => 'nullable|string',
+        'status'           => 'nullable|int|min:0|max:4',
+        'message'          => 'nullable|string',
+        'visible'          => 'nullable|bool',
+        'component_id'     => 'nullable|int',
+        'component_status' => 'nullable|int|min:1|max:4|required_with:component_id',
+        'notify'           => 'nullable|bool',
+        'stickied'         => 'nullable|bool',
+        'template'         => 'nullable|string',
     ];
 
     /**

diff --git a/app/Bus/Commands/IncidentUpdate/UpdateIncidentUpdateCommand.php b/app/Bus/Commands/IncidentUpdate/UpdateIncidentUpdateCommand.php
@@ -55,10 +55,8 @@ final class UpdateIncidentUpdateCommand
      * @var string[]
      */
     public $rules = [
-        'update'  => 'required',
-        'status'  => 'int|min:1|max:4',
-        'message' => 'string',
-        'user'    => 'required',
+        'status'  => 'nullable|int|min:1|max:4',
+        'message' => 'nullable|string',
     ];
 
     /**

diff --git a/app/Bus/Commands/Metric/AddMetricCommand.php b/app/Bus/Commands/Metric/AddMetricCommand.php
@@ -91,15 +91,15 @@ final class AddMetricCommand
     public $rules = [
         'name'          => 'required|string',
         'suffix'        => 'required|string',
-        'description'   => 'string',
-        'display_chart' => 'bool',
-        'default_value' => 'int',
-        'calc_type'     => 'int',
-        'display_chart' => 'int',
-        'places'        => 'int|between:0,4',
-        'default_view'  => 'int|between:0,3',
-        'threshold'     => 'numeric|between:0,10',
-        'order'         => 'int',
+        'description'   => 'nullable|string',
+        'display_chart' => 'nullable|bool',
+        'default_value' => 'required|int',
+        'calc_type'     => 'required|int',
+        'display_chart' => 'nullable|int',
+        'places'        => 'nullable|int|between:0,4',
+        'default_view'  => 'required|int|between:0,3',
+        'threshold'     => 'nullable|numeric|between:0,10',
+        'order'         => 'nullable|int',
     ];
 
     /**

diff --git a/app/Bus/Commands/Metric/AddMetricPointCommand.php b/app/Bus/Commands/Metric/AddMetricPointCommand.php
@@ -42,8 +42,8 @@ final class AddMetricPointCommand
      * @var string[]
      */
     public $rules = [
-        'value'      => 'numeric',
-        'created_at' => 'string',
+        'value'      => 'required|numeric',
+        'created_at' => 'required|string',
     ];
 
     /**

diff --git a/app/Bus/Commands/Metric/UpdateMetricCommand.php b/app/Bus/Commands/Metric/UpdateMetricCommand.php
@@ -98,17 +98,17 @@ final class UpdateMetricCommand
      * @var string[]
      */
     public $rules = [
-        'name'          => 'string',
-        'suffix'        => 'string',
-        'description'   => 'string',
-        'display_chart' => 'bool',
-        'default_value' => 'numeric',
-        'calc_type'     => 'int|in:0,1',
-        'display_chart' => 'int',
-        'places'        => 'numeric|between:0,4',
-        'default_view'  => 'numeric|between:0,4',
-        'threshold'     => 'numeric|between:0,10',
-        'order'         => 'int',
+        'name'          => 'nullable|string',
+        'suffix'        => 'nullable|string',
+        'description'   => 'nullable|string',
+        'display_chart' => 'nullable|bool',
+        'default_value' => 'nullable|numeric',
+        'calc_type'     => 'nullable|int|in:0,1',
+        'display_chart' => 'nullable|int',
+        'places'        => 'nullable|numeric|between:0,4',
+        'default_view'  => 'nullable|numeric|between:0,4',
+        'threshold'     => 'nullable|numeric|between:0,10',
+        'order'         => 'nullable|int',
     ];
 
     /**

diff --git a/app/Bus/Commands/Metric/UpdateMetricPointCommand.php b/app/Bus/Commands/Metric/UpdateMetricPointCommand.php
@@ -55,8 +55,8 @@ final class UpdateMetricPointCommand
      * @var string[]
      */
     public $rules = [
-        'value'      => 'numeric',
-        'created_at' => 'string',
+        'value'      => 'nullable|numeric',
+        'created_at' => 'nullable|string',
     ];
 
     /**

diff --git a/app/Bus/Commands/User/AddUserCommand.php b/app/Bus/Commands/User/AddUserCommand.php
@@ -53,8 +53,8 @@ final class AddUserCommand
      */
     public $rules = [
         'username' => 'required|string',
-        'password' => 'string',
-        'level'    => 'int',
+        'password' => 'required|string',
+        'level'    => 'required|int',
     ];
 
     /**

diff --git a/app/Bus/Commands/User/SignupUserCommand.php b/app/Bus/Commands/User/SignupUserCommand.php
@@ -48,9 +48,9 @@ final class SignupUserCommand
      */
     public $rules = [
         'username' => 'required|string',
-        'password' => 'string',
+        'password' => 'required|string',
         'email'    => 'required|string|email',
-        'level'    => 'int',
+        'level'    => 'required|int',
     ];
 
     /**

diff --git a/app/Bus/Handlers/Commands/Incident/ReportIncidentCommandHandler.php b/app/Bus/Handlers/Commands/Incident/ReportIncidentCommandHandler.php
@@ -63,7 +63,7 @@ public function handle(ReportIncidentCommand $command)
             'stickied' => $command->stickied,
         ];
 
-        if ($template = IncidentTemplate::where('slug', $command->template)->first()) {
+        if ($template = IncidentTemplate::where('slug', '=', $command->template)->first()) {
             $data['message'] = $this->parseTemplate($template, $command);
         } else {
             $data['message'] = $command->message;

diff --git a/app/Bus/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php b/app/Bus/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php
@@ -56,7 +56,7 @@ public function __construct(DateFactory $dates)
      */
     public function handle(UpdateIncidentCommand $command)
     {
-        if ($template = IncidentTemplate::where('slug', $command->template)->first()) {
+        if ($template = IncidentTemplate::where('slug', '=', $command->template)->first()) {
             $command->message = $this->parseTemplate($template, $command);
         }
 

diff --git a/app/Bus/Handlers/Commands/Metric/AddMetricPointCommandHandler.php b/app/Bus/Handlers/Commands/Metric/AddMetricPointCommandHandler.php
@@ -63,7 +63,7 @@ public function handle(AddMetricPointCommand $command)
     protected function findOrCreatePoint(AddMetricPointCommand $command)
     {
         $buffer = Carbon::now()->subMinutes($command->metric->threshold);
-        $point = MetricPoint::where('metric_id', $command->metric->id)->where('value', $command->value)->where('created_at', '>=', $buffer)->first();
+        $point = MetricPoint::where('metric_id', '=', $command->metric->id)->where('value', '=', $command->value)->where('created_at', '>=', $buffer)->first();
 
         if ($point) {
             return $point;

diff --git a/app/Bus/Handlers/Commands/Subscriber/SubscribeSubscriberCommandHandler.php b/app/Bus/Handlers/Commands/Subscriber/SubscribeSubscriberCommandHandler.php
@@ -36,7 +36,7 @@ class SubscribeSubscriberCommandHandler
      */
     public function handle(SubscribeSubscriberCommand $command)
     {
-        if ($subscriber = Subscriber::where('email', $command->email)->first()) {
+        if ($subscriber = Subscriber::where('email', '=', $command->email)->first()) {
             return $subscriber;
         }
 

diff --git a/app/Foundation/Providers/EventServiceProvider.php b/app/Foundation/Providers/EventServiceProvider.php
@@ -16,7 +16,7 @@
 class EventServiceProvider extends ServiceProvider
 {
     /**
-     * The event handler mappings for the application.
+     * The event listener mappings for the application.
      *
      * @var array
      */

diff --git a/app/Foundation/Providers/ModuleServiceProvider.php b/app/Foundation/Providers/ModuleServiceProvider.php
@@ -58,7 +58,7 @@ class ModuleServiceProvider extends ServiceProvider
      */
     public function boot(BladeCompiler $blade)
     {
-        $blade->directive('modules', function ($group = null) {
+        $blade->directive('modules', function ($group) {
             return sprintf(
                 '<?php echo $app->call(\'%s@%s\', [
                     \'factory\' => $__env,
@@ -68,7 +68,7 @@ public function boot(BladeCompiler $blade)
                 ]); ?>',
                 ModulesRenderer::class,
                 'renderModules',
-                $group === null ? 'null' : $group
+                empty($group) ? 'null' : $group
             );
         });
     }