lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2636 from CachetHQ/command-validation-bug

Browse Source 
Fix lack of Command Validating middleware
This commit is contained in:
James Brooks
2017-07-17 21:33:40 +01:00
committed by GitHub
parent 3ad23828ba 39718c7936
commit c77e5df22b
8 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Bus/Commands/Component/CreateComponentCommand.php
View File

@@ -70,7 +70,7 @@ final class CreateComponentCommand
/**
* JSON meta data for the component.
*
* @var string|null
* @var array|null
*/
public $meta;
@@ -87,7 +87,7 @@ final class CreateComponentCommand
'order' => 'nullable|int',
'group_id' => 'nullable|int',
'enabled' => 'nullable|bool',
'meta' => 'nullable|string',
'meta' => 'nullable|array',
];
/**
@@ -100,7 +100,7 @@ final class CreateComponentCommand
* @param int $order
* @param int $group_id
* @param bool $enabled
* @param string|null $meta
* @param array|null $meta
*
* @return void
*/

6
app/Bus/Commands/Component/UpdateComponentCommand.php
View File

@@ -74,7 +74,7 @@ final class UpdateComponentCommand
/**
* JSON meta data for the component.
*
* @var string|null
* @var array|null
*/
public $meta;
@@ -98,7 +98,7 @@ final class UpdateComponentCommand
'order' => 'nullable|int',
'group_id' => 'nullable|int',
'enabled' => 'nullable|bool',
'meta' => 'nullable|string',
'meta' => 'nullable|array',
'silent' => 'nullable|bool',
];
@@ -113,7 +113,7 @@ final class UpdateComponentCommand
* @param int $order
* @param int $group_id
* @param bool $enabled
* @param string|null $meta
* @param array|null $meta
* @param bool $silent
*
* @return void

4
app/Bus/Commands/Incident/CreateIncidentCommand.php
View File

@@ -111,7 +111,7 @@ final class CreateIncidentCommand
public $rules = [
'name' => 'required|string',
'status' => 'required|int|min:0|max:4',
'message' => 'required|string',
'message' => 'nullable|string',
'visible' => 'nullable|bool',
'component_id' => 'nullable|required_with:component_status|int',
'component_status' => 'nullable|required_with:component_id|int|min:0|max:4',
@@ -119,7 +119,7 @@ final class CreateIncidentCommand
'stickied' => 'required|bool',
'occurred_at' => 'nullable|string',
'template' => 'nullable|string',
'meta' => 'required|array',
'meta' => 'nullable|array',
];
/**

6
app/Bus/Commands/Metric/CreateMetricPointCommand.php
View File

@@ -38,7 +38,7 @@ final class CreateMetricPointCommand
/**
* The metric point created at.
*
* @var string
* @var int
*/
public $created_at;
@@ -49,7 +49,7 @@ final class CreateMetricPointCommand
*/
public $rules = [
'value' => 'required|numeric',
'created_at' => 'required|string',
'created_at' => 'nullable|int',
];
/**
@@ -57,7 +57,7 @@ final class CreateMetricPointCommand
*
* @param \CachetHQ\Cachet\Models\Metric $metric
* @param int $value
* @param string $created_at
* @param int $created_at
*
* @return void
*/

2
app/Bus/Commands/Metric/UpdateMetricCommand.php
View File

@@ -116,7 +116,7 @@ final class UpdateMetricCommand
'default_view' => 'nullable|numeric|between:0,4',
'threshold' => 'nullable|int',
'order' => 'nullable|int',
'visible' => 'required|int|between:0,2',
'visible' => 'nullable|int|between:0,2',
];
/**

4
app/Bus/Commands/Schedule/CreateScheduleCommand.php
View File

@@ -71,7 +71,7 @@ final class CreateScheduleCommand
'status' => 'required|int|min:0|max:2',
'scheduled_at' => 'required|string',
'completed_at' => 'nullable|string',
'components' => 'required|array',
'components' => 'nullable|array',
];
/**
@@ -86,7 +86,7 @@ final class CreateScheduleCommand
*
* @return void
*/
public function __construct($name, $message, $status, $scheduled_at, $completed_at, array $components)
public function __construct($name, $message, $status, $scheduled_at, $completed_at, array $components = [])
{
$this->name = $name;
$this->message = $message;

3
app/Foundation/Providers/AppServiceProvider.php
View File

@@ -12,6 +12,7 @@
namespace CachetHQ\Cachet\Foundation\Providers;
use AltThree\Bus\Dispatcher;
use AltThree\Validator\ValidatingMiddleware;
use CachetHQ\Cachet\Bus\Middleware\UseDatabaseTransactions;
use CachetHQ\Cachet\Services\Dates\DateFactory;
use Illuminate\Database\Eloquent\Relations\Relation;
@@ -41,7 +42,7 @@ class AppServiceProvider extends ServiceProvider
return Dispatcher::simpleMapping($command, 'CachetHQ\Cachet\Bus', 'CachetHQ\Cachet\Bus\Handlers');
});
$dispatcher->pipeThrough([UseDatabaseTransactions::class]);
$dispatcher->pipeThrough([UseDatabaseTransactions::class, ValidatingMiddleware::class]);
Str::macro('canonicalize', function ($url) {
return preg_replace('/([^\/])$/', '$1/', $url);

6
tests/Api/MetricPointTest.php
View File

@@ -70,7 +70,6 @@ class MetricPointTest extends AbstractApiTestCase
$metric = factory('CachetHQ\Cachet\Models\Metric')->create();
$timestamp = 1434369116;
$datetime = '2015-06-15 11:51:56';
$metricPoint = factory('CachetHQ\Cachet\Models\MetricPoint')->make([
'metric_id' => $metric->id,
]);
@@ -79,7 +78,10 @@ class MetricPointTest extends AbstractApiTestCase
$this->post("/api/v1/metrics/{$metric->id}/points", $postData);
$this->seeJsonContains(['value' => $metricPoint->value, 'created_at' => $datetime]);
$this->seeJsonContains([
'value' => $metricPoint->value,
'created_at' => date('Y-m-d H:i:s', 1434369116),
]);
$this->assertResponseOk();
}