From 60db703a27bb09d0a51023131f850d5d424997db Mon Sep 17 00:00:00 2001
From: Graham Campbell <GrahamCampbell@users.noreply.github.com>
Date: Tue, 23 Apr 2019 13:44:51 +0100
Subject: [PATCH 1/3] [5.8] Enable JS on StyleCI (#5000)

* Enable JS on StyleCI
---
 .styleci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.styleci.yml b/.styleci.yml
index bbcd3bf3..1db61d96 100644
--- a/.styleci.yml
+++ b/.styleci.yml
@@ -6,4 +6,8 @@ php:
     not-name:
       - index.php
       - server.php
+js:
+  finder:
+    not-name:
+      - webpack.mix.js
 css: true

From 12a4885a47fbd272a4a942d49d7b1eb1b42f2b19 Mon Sep 17 00:00:00 2001
From: Stefan Bauer <mail@stefanbauer.me>
Date: Wed, 24 Apr 2019 14:38:18 +0200
Subject: [PATCH 2/3] Fix phpdoc to order by syntax convention (#5005)

Reorder the `@var` phpdoc syntax by convention, see http://docs.phpdoc.org/references/phpdoc/tags/var.html
---
 database/factories/UserFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 14aa8086..545516cf 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-/* @var $factory \Illuminate\Database\Eloquent\Factory */
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
 
 use App\User;
 use Illuminate\Support\Str;

From 50176732d66b197de62d5567b79fc77f63e2cfbd Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylor@laravel.com>
Date: Wed, 24 Apr 2019 07:38:42 -0500
Subject: [PATCH 3/3] Apply fixes from StyleCI (#5006)

---
 database/factories/UserFactory.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 545516cf..5e516cee 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -1,7 +1,6 @@
 <?php
 
 /** @var \Illuminate\Database\Eloquent\Factory $factory */
-
 use App\User;
 use Illuminate\Support\Str;
 use Faker\Generator as Faker;