Apply fixes from StyleCI (#1115)

austintoddj · Aug 9, 2022 · ea9a108 · ea9a108
1 parent 8608285
commit ea9a108
Show file tree

Hide file tree

Showing 19 changed files with 40 additions and 52 deletions.
diff --git a/src/Canvas.php b/src/Canvas.php
@@ -51,7 +51,6 @@ public static function availableLanguageCodes()
      * Return an encoded string of app translations.
      *
      * @param $locale
-     *
      * @return string
      */
     public static function availableTranslations($locale)

diff --git a/src/CanvasServiceProvider.php b/src/CanvasServiceProvider.php
@@ -14,7 +14,6 @@
 use Canvas\Listeners\CaptureView;
 use Canvas\Listeners\CaptureVisit;
 use Canvas\Models\User;
-use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Events\Dispatcher;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
@@ -34,8 +33,9 @@ public function register()
     /**
      * Bootstrap any application services.
      *
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      * @return void
+     *
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
     public function boot()
     {
@@ -54,8 +54,9 @@ public function boot()
     /**
      * Register the events and listeners.
      *
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      * @return void
+     *
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
     private function registerEvents()
     {

diff --git a/src/Http/Controllers/Auth/AuthenticatedSessionController.php b/src/Http/Controllers/Auth/AuthenticatedSessionController.php
@@ -28,9 +28,10 @@ public function create()
     /**
      * Handle an incoming authentication request.
      *
-     * @throws \Illuminate\Validation\ValidationException
      * @param  \Canvas\Http\Requests\AuthenticatedSessionRequest  $request
      * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Illuminate\Validation\ValidationException
      */
     public function store(AuthenticatedSessionRequest $request)
     {

diff --git a/src/Http/Controllers/Auth/PasswordResetLinkController.php b/src/Http/Controllers/Auth/PasswordResetLinkController.php
@@ -27,9 +27,10 @@ public function create()
     /**
      * Handle an incoming password reset link request.
      *
-     * @throws Exception
      * @param  \Canvas\Http\Requests\PasswordResetLinkRequest  $request
      * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws Exception
      */
     public function store(PasswordResetLinkRequest $request)
     {

diff --git a/src/Http/Controllers/PostController.php b/src/Http/Controllers/PostController.php
@@ -11,7 +11,6 @@
 use Canvas\Models\User;
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Routing\Controller;
 use Ramsey\Uuid\Uuid;
 
@@ -97,10 +96,11 @@ public function create()
     /**
      * Store a newly created resource in storage.
      *
-     * @throws Exception
      * @param  \Canvas\Http\Requests\StorePostRequest  $request
-     * @param string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws Exception
      */
     public function store(StorePostRequest $request, string $id)
     {
@@ -170,7 +170,7 @@ public function store(StorePostRequest $request, string $id)
     /**
      * Display the specified resource.
      *
-     * @param string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function show(string $id)
@@ -191,9 +191,10 @@ public function show(string $id)
     /**
      * Remove the specified resource from storage.
      *
-     * @throws Exception
-     * @param string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws Exception
      */
     public function destroy(string $id)
     {

diff --git a/src/Http/Controllers/SearchController.php b/src/Http/Controllers/SearchController.php
@@ -9,7 +9,6 @@
 use Canvas\Models\Topic;
 use Canvas\Models\User;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Cache;
 

diff --git a/src/Http/Controllers/TagController.php b/src/Http/Controllers/TagController.php
@@ -8,7 +8,6 @@
 use Canvas\Models\Tag;
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Routing\Controller;
 use Ramsey\Uuid\Uuid;
 
@@ -52,7 +51,7 @@ public function create()
      * Store a newly created resource in storage.
      *
      * @param  \Canvas\Http\Requests\StoreTagRequest  $request
-     * @param string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function store(StoreTagRequest $request, string $id)
@@ -83,7 +82,7 @@ public function store(StoreTagRequest $request, string $id)
     /**
      * Display the specified resource.
      *
-     * @param string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function show(string $id)
@@ -96,7 +95,7 @@ public function show(string $id)
     /**
      * Display the specified relationship.
      *
-     * @param string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function posts(string $id)
@@ -109,9 +108,10 @@ public function posts(string $id)
     /**
      * Remove the specified resource from storage.
      *
-     * @throws Exception
-     * @param string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws Exception
      */
     public function destroy(string $id)
     {

diff --git a/src/Http/Controllers/TopicController.php b/src/Http/Controllers/TopicController.php
@@ -8,7 +8,6 @@
 use Canvas\Models\Topic;
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Routing\Controller;
 use Ramsey\Uuid\Uuid;
 
@@ -52,7 +51,7 @@ public function create()
      * Store a newly created resource in storage.
      *
      * @param  \Canvas\Http\Requests\StoreTopicRequest  $request
-     * @param string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function store(StoreTopicRequest $request, string $id)
@@ -83,7 +82,7 @@ public function store(StoreTopicRequest $request, string $id)
     /**
      * Display the specified resource.
      *
-     * @param string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function show(string $id)
@@ -96,7 +95,7 @@ public function show(string $id)
     /**
      * Display the specified relationship.
      *
-     * @param string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function posts(string $id)
@@ -109,9 +108,10 @@ public function posts(string $id)
     /**
      * Remove the specified resource from storage.
      *
-     * @throws Exception
-     * @param string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws Exception
      */
     public function destroy(string $id)
     {

diff --git a/src/Http/Controllers/UploadsController.php b/src/Http/Controllers/UploadsController.php
@@ -5,7 +5,6 @@
 namespace Canvas\Http\Controllers;
 
 use Canvas\Canvas;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Storage;
 

diff --git a/src/Http/Controllers/UserController.php b/src/Http/Controllers/UserController.php
@@ -8,7 +8,6 @@
 use Canvas\Http\Requests\StoreUserRequest;
 use Canvas\Models\User;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Hash;
@@ -55,7 +54,7 @@ public function create()
      * Store a newly created resource in storage.
      *
      * @param  \Canvas\Http\Requests\StoreUserRequest  $request
-     * @param string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function store(StoreUserRequest $request, string $id)
@@ -100,7 +99,7 @@ public function store(StoreUserRequest $request, string $id)
     /**
      * Display the specified resource.
      *
-     * @param string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function show(string $id)
@@ -113,7 +112,7 @@ public function show(string $id)
     /**
      * Display the specified relationship.
      *
-     * @param string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function posts(string $id)
@@ -126,7 +125,7 @@ public function posts(string $id)
     /**
      * Remove the specified resource from storage.
      *
-     * @param string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function destroy(string $id)

diff --git a/src/Http/Middleware/AuthenticateSession.php b/src/Http/Middleware/AuthenticateSession.php
@@ -31,10 +31,11 @@ public function __construct(Auth $auth)
     /**
      * Handle the incoming request.
      *
-     * @throws \Illuminate\Auth\AuthenticationException
      * @param  \Illuminate\Http\Request  $request
      * @param  Closure  $next
      * @return mixed
+     *
+     * @throws \Illuminate\Auth\AuthenticationException
      */
     public function handle(Request $request, Closure $next)
     {

diff --git a/src/Http/Requests/AuthenticatedSessionRequest.php b/src/Http/Requests/AuthenticatedSessionRequest.php
@@ -38,8 +38,9 @@ public function rules()
     /**
      * Attempt to authenticate the request's credentials.
      *
-     * @throws \Illuminate\Validation\ValidationException
      * @return void
+     *
+     * @throws \Illuminate\Validation\ValidationException
      */
     public function authenticate()
     {

diff --git a/src/Models/Post.php b/src/Models/Post.php
@@ -6,9 +6,7 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Post extends Model

diff --git a/src/Models/Tag.php b/src/Models/Tag.php
@@ -5,8 +5,6 @@
 namespace Canvas\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Tag extends Model

diff --git a/src/Models/Topic.php b/src/Models/Topic.php
@@ -5,8 +5,6 @@
 namespace Canvas\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Topic extends Model

diff --git a/src/Models/User.php b/src/Models/User.php
@@ -6,7 +6,6 @@
 
 use Canvas\Canvas;
 use Canvas\Traits\HasRole;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 

diff --git a/src/Models/View.php b/src/Models/View.php
@@ -5,7 +5,6 @@
 namespace Canvas\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class View extends Model
 {

diff --git a/src/Models/Visit.php b/src/Models/Visit.php
@@ -5,7 +5,6 @@
 namespace Canvas\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Visit extends Model
 {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -5,7 +5,6 @@
 use Canvas\CanvasServiceProvider;
 use Canvas\Models\User;
 use Exception;
-use Illuminate\Foundation\Application;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Orchestra\Testbench\TestCase as OrchestraTestCase;
 
@@ -35,9 +34,9 @@ abstract class TestCase extends OrchestraTestCase
     protected $admin;
 
     /**
-     * @throws Exception
-     *
      * @return void
+     *
+     * @throws Exception
      */
     protected function setUp(): void
     {
@@ -50,7 +49,6 @@ protected function setUp(): void
 
     /**
      * @param  \Illuminate\Foundation\Application  $app
-     *
      * @return array
      */
     protected function getPackageProviders($app): array
@@ -62,7 +60,6 @@ protected function getPackageProviders($app): array
 
     /**
      * @param  \Illuminate\Foundation\Application  $app
-     *
      * @return void
      */
     protected function resolveApplicationCore($app): void
@@ -75,8 +72,7 @@ protected function resolveApplicationCore($app): void
     }
 
     /**
-     * @param \Illuminate\Foundation\Application $app
-     *
+     * @param  \Illuminate\Foundation\Application  $app
      * @return void
      */
     protected function getEnvironmentSetUp($app): void
@@ -105,11 +101,10 @@ protected function getEnvironmentSetUp($app): void
     }
 
     /**
-     * @throws Exception
-     *
      * @param  \Illuminate\Foundation\Application  $app
-     *
      * @return void
+     *
+     * @throws Exception
      */
     protected function setUpDatabase($app)
     {