From bdb3619bc919cd8b7e455e5febc387130c11a610 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Fri, 12 Jul 2019 12:38:58 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Http/Controllers/Api/ComponentController.php | 1 - app/Http/Controllers/Dashboard/ComponentController.php | 2 -- app/Models/Tag.php | 4 ++-- app/Models/Traits/HasTags.php | 2 +- tests/Api/ComponentTest.php | 7 +++---- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/Api/ComponentController.php b/app/Http/Controllers/Api/ComponentController.php index c4d1a178..9bda7b09 100644 --- a/app/Http/Controllers/Api/ComponentController.php +++ b/app/Http/Controllers/Api/ComponentController.php @@ -18,7 +18,6 @@ use CachetHQ\Cachet\Models\Component; use GrahamCampbell\Binput\Facades\Binput; use Illuminate\Contracts\Auth\Guard; use Illuminate\Database\QueryException; -use Illuminate\Support\Collection; use Illuminate\Support\Facades\Request; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; diff --git a/app/Http/Controllers/Dashboard/ComponentController.php b/app/Http/Controllers/Dashboard/ComponentController.php index 43dfd6a2..c9c8e679 100644 --- a/app/Http/Controllers/Dashboard/ComponentController.php +++ b/app/Http/Controllers/Dashboard/ComponentController.php @@ -19,8 +19,6 @@ use CachetHQ\Cachet\Models\Component; use CachetHQ\Cachet\Models\ComponentGroup; use GrahamCampbell\Binput\Facades\Binput; use Illuminate\Routing\Controller; -use Illuminate\Support\Arr; -use Illuminate\Support\Collection; use Illuminate\Support\Facades\View; /** diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 874b07ca..022ceb8c 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -64,13 +64,13 @@ class Tag extends Model public static function findOrCreate($values) { $tags = collect($values)->map(function ($value) { - if ($value instanceof Tag) { + if ($value instanceof self) { return $value; } $tag = static::where('name', '=', $value)->first(); - if (!$tag instanceof Tag) { + if (!$tag instanceof self) { $tag = static::create([ 'name' => $value, 'slug' => Str::slug($value), diff --git a/app/Models/Traits/HasTags.php b/app/Models/Traits/HasTags.php index 40ea6447..3e470841 100644 --- a/app/Models/Traits/HasTags.php +++ b/app/Models/Traits/HasTags.php @@ -64,7 +64,7 @@ trait HasTags */ public function setTagsAttribute($tags) { - if (! $this->exists) { + if (!$this->exists) { $this->queuedTags = $tags; return; diff --git a/tests/Api/ComponentTest.php b/tests/Api/ComponentTest.php index e396b553..c3f71e0c 100644 --- a/tests/Api/ComponentTest.php +++ b/tests/Api/ComponentTest.php @@ -40,8 +40,8 @@ class ComponentTest extends AbstractApiTestCase public function test_can_get_all_components_with_tags() { $components = factory(Component::class, 2)->create(); - $components[0]->attachTags(["Hello World"]); - $components[1]->attachTags(["Foo", "Bar"]); + $components[0]->attachTags(['Hello World']); + $components[1]->attachTags(['Foo', 'Bar']); $response = $this->json('GET', '/api/v1/components', ['tags' => ['foo']]); @@ -235,14 +235,13 @@ class ComponentTest extends AbstractApiTestCase $response = $this->json('PUT', '/api/v1/components/1', [ 'name' => 'Foo', - 'tags' => 'Hello' + 'tags' => 'Hello', ]); $response->assertStatus(200); $response->assertJsonFragment(['name' => 'Foo', 'enabled' => $component->enabled, 'tags' => ['hello' => 'Hello']]); } - public function test_can_update_component_without_status_change() { $this->beUser();