Merge branch 'release/6.0.35'

* release/6.0.35: compile assets updates to repo docs Apply fixes from StyleCI (#1003) Create SECURITY.md
austintoddj · Nov 29, 2021 · 51fca46 · 51fca46
2 parents aadbde5 + cf38337
commit 51fca46
Show file tree

Hide file tree

Showing 33 changed files with 1,197 additions and 1,231 deletions.
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
@@ -0,0 +1,8 @@
+# Security Policy
+
+**PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY, [SEE BELOW](#reporting-a-vulnerability).**
+
+## Reporting a Vulnerability
+
+If you discover a security vulnerability within the package, please send an email to Todd Austin at austin.todd.
+[email protected]. All security vulnerabilities will be promptly addressed.
diff --git a/.github/SPONSORS.md b/.github/SPONSORS.md
@@ -1,4 +1,4 @@
-## Sponsors
+# Sponsors
 
 [Canvas](https://trycanvas.app) is a freely available, open source project that gives something back to the greater
  [Laravel](https://laravel.com) community. Since blog platforms dominate so much of the Internet today, it makes
@@ -12,7 +12,7 @@ If you haven't already, [star the repo](https://github.com/austintoddj/canvas/st
 
 ---
 
-### Open Source Sponsor (Licenses/Services)
+## Open Source Sponsor (Licenses/Services)
 
 <table width="100%" border="0" cellpadding="5">
 

diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/css/app.css.map b/public/css/app.css.map
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/app.js.LICENSE.txt b/public/js/app.js.LICENSE.txt
@@ -2,7 +2,7 @@
  * @license MIT */
 
 /*!
-  * Bootstrap v4.6.0 (https://getbootstrap.com/)
+  * Bootstrap v4.6.1 (https://getbootstrap.com/)
   * Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
   */
@@ -22,13 +22,13 @@
  */
 
 /*!
- * FilePond 4.29.0
+ * FilePond 4.30.3
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */
 
 /*!
- * FilePondPluginFileValidateSize 2.2.4
+ * FilePondPluginFileValidateSize 2.2.5
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */
@@ -46,7 +46,7 @@
  */
 
 /*!
- * FilePondPluginImagePreview 4.6.8
+ * FilePondPluginImagePreview 4.6.10
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */

diff --git a/public/js/app.js.map b/public/js/app.js.map
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,4 +1,4 @@
 {
-    "/js/app.js": "/js/app.js?id=c485dc511cf72829d8be",
-    "/css/app.css": "/css/app.css?id=ade4a5e16f09cdfbea3c"
+    "/js/app.js": "/js/app.js?id=9e5dee61c8dd6fea9532",
+    "/css/app.css": "/css/app.css?id=9dcde57dde05a868a057"
 }
diff --git a/resources/js/components/modals/PublishModal.vue b/resources/js/components/modals/PublishModal.vue
@@ -29,13 +29,7 @@
 
                     <div class="row">
                         <div
-                            class="
-                                col-sm-6 col-12
-                                pb-sm-0 pb-3
-                                pr-sm-0
-                                d-flex
-                                justify-content-center justify-content-sm-start
-                            "
+                            class="col-sm-6 col-12 pb-sm-0 pb-3 pr-sm-0 d-flex justify-content-center justify-content-sm-start"
                         >
                             <div class="d-flex align-items-center">
                                 <select

diff --git a/resources/js/views/AllStats.vue b/resources/js/views/AllStats.vue
@@ -29,15 +29,7 @@
                     <div class="card-deck mt-4 pt-2">
                         <div class="card shadow-lg">
                             <div
-                                class="
-                                    card-header
-                                    pb-0
-                                    bg-transparent
-                                    d-flex
-                                    justify-content-between
-                                    align-middle
-                                    border-0
-                                "
+                                class="card-header pb-0 bg-transparent d-flex justify-content-between align-middle border-0"
                             >
                                 <p class="font-weight-bold text-muted small text-uppercase">{{ trans.views }}</p>
                                 <p>
@@ -52,15 +44,7 @@
                         </div>
                         <div class="card shadow-lg">
                             <div
-                                class="
-                                    card-header
-                                    pb-0
-                                    bg-transparent
-                                    d-flex
-                                    justify-content-between
-                                    align-middle
-                                    border-0
-                                "
+                                class="card-header pb-0 bg-transparent d-flex justify-content-between align-middle border-0"
                             >
                                 <p class="font-weight-bold text-muted small text-uppercase">{{ trans.visitors }}</p>
                                 <p>

diff --git a/src/Canvas.php b/src/Canvas.php
@@ -113,7 +113,7 @@ public static function baseStoragePath(): string
     /**
      * Return a valid host URL or null.
      *
-     * @param string|null $url
+     * @param  string|null  $url
      * @return string|null
      */
     public static function parseReferer(?string $url): ?string
@@ -128,10 +128,10 @@ public static function parseReferer(?string $url): ?string
     /**
      * Generate a Gravatar for a given email.
      *
-     * @param string $email
-     * @param int $size
-     * @param string $default
-     * @param string $rating
+     * @param  string  $email
+     * @param  int  $size
+     * @param  string  $default
+     * @param  string  $rating
      * @return string
      */
     public static function gravatar(
@@ -148,7 +148,7 @@ public static function gravatar(
     /**
      * Return true if dark mode is enabled.
      *
-     * @param int|null $enabled
+     * @param  int|null  $enabled
      * @return bool
      */
     public static function enabledDarkMode(?int $enabled): bool
@@ -159,7 +159,7 @@ public static function enabledDarkMode(?int $enabled): bool
     /**
      * Return true if the app is configured to use Arabic or Farsi.
      *
-     * @param string|null $locale
+     * @param  string|null  $locale
      * @return bool
      */
     public static function usingRightToLeftLanguage(?string $locale): bool

diff --git a/src/CanvasServiceProvider.php b/src/CanvasServiceProvider.php
@@ -33,6 +33,7 @@ public function register(): void
      * Bootstrap any application services.
      *
      * @return void
+     *
      * @throws BindingResolutionException
      */
     public function boot(): void
@@ -51,6 +52,7 @@ public function boot(): void
      * Register the events and listeners.
      *
      * @return void
+     *
      * @throws BindingResolutionException
      */
     private function registerEvents(): void

diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -64,8 +64,8 @@ public function handle()
     /**
      * Create a new default user.
      *
-     * @param string $email
-     * @param string $password
+     * @param  string  $email
+     * @param  string  $password
      * @return void
      */
     protected function createDefaultUser(string $email, string $password)

diff --git a/src/Console/UiCommand.php b/src/Console/UiCommand.php
@@ -76,8 +76,8 @@ public function handle()
     /**
      * Update the "package.json" file.
      *
-     * @param callable $callback
-     * @param bool $dev
+     * @param  callable  $callback
+     * @param  bool  $dev
      * @return void
      */
     protected function updateNodePackages(callable $callback, $dev = true)
@@ -145,7 +145,7 @@ protected function exportBackend()
     /**
      * Get full view path relative to the application's configured view path.
      *
-     * @param string $path
+     * @param  string  $path
      * @return string
      */
     protected function getViewPath($path)

diff --git a/src/Events/PostViewed.php b/src/Events/PostViewed.php
@@ -16,7 +16,7 @@ class PostViewed
     /**
      * Create a new event instance.
      *
-     * @param Post $post
+     * @param  Post  $post
      */
     public function __construct(Post $post)
     {

diff --git a/src/Http/Controllers/Auth/AuthenticatedSessionController.php b/src/Http/Controllers/Auth/AuthenticatedSessionController.php
@@ -31,8 +31,9 @@ public function create()
     /**
      * Handle an incoming authentication request.
      *
-     * @param LoginRequest $request
+     * @param  LoginRequest  $request
      * @return RedirectResponse
+     *
      * @throws ValidationException
      */
     public function store(LoginRequest $request)
@@ -47,7 +48,7 @@ public function store(LoginRequest $request)
     /**
      * Destroy an authenticated session.
      *
-     * @param Request $request
+     * @param  Request  $request
      * @return RedirectResponse
      */
     public function destroy(Request $request)

diff --git a/src/Http/Controllers/Auth/NewPasswordController.php b/src/Http/Controllers/Auth/NewPasswordController.php
@@ -20,7 +20,7 @@ class NewPasswordController extends Controller
     /**
      * Display the password reset view.
      *
-     * @param Request $request
+     * @param  Request  $request
      * @return Application|Factory|View
      */
     public function create(Request $request)
@@ -34,7 +34,7 @@ public function create(Request $request)
     /**
      * Handle an incoming new password request.
      *
-     * @param Request $request
+     * @param  Request  $request
      * @return RedirectResponse
      *
      * @throws Exception

diff --git a/src/Http/Controllers/Auth/PasswordResetLinkController.php b/src/Http/Controllers/Auth/PasswordResetLinkController.php
@@ -29,8 +29,9 @@ public function create()
     /**
      * Handle an incoming password reset link request.
      *
-     * @param Request $request
+     * @param  Request  $request
      * @return RedirectResponse
+     *
      * @throws Exception
      */
     public function store(Request $request)

diff --git a/src/Http/Controllers/PostController.php b/src/Http/Controllers/PostController.php
@@ -87,9 +87,10 @@ public function create(): JsonResponse
     /**
      * Store a newly created resource in storage.
      *
-     * @param PostRequest $request
+     * @param  PostRequest  $request
      * @param $id
      * @return JsonResponse
+     *
      * @throws Exception
      */
     public function store(PostRequest $request, $id): JsonResponse
@@ -182,7 +183,7 @@ public function show($id): JsonResponse
     /**
      * Display stats for the specified resource.
      *
-     * @param string $id
+     * @param  string  $id
      * @return JsonResponse
      */
     public function stats(string $id): JsonResponse
@@ -208,6 +209,7 @@ public function stats(string $id): JsonResponse
      *
      * @param $id
      * @return mixed
+     *
      * @throws Exception
      */
     public function destroy($id)

diff --git a/src/Http/Controllers/TagController.php b/src/Http/Controllers/TagController.php
@@ -42,7 +42,7 @@ public function create(): JsonResponse
     /**
      * Store a newly created resource in storage.
      *
-     * @param TagRequest $request
+     * @param  TagRequest  $request
      * @param $id
      * @return JsonResponse
      */
@@ -102,6 +102,7 @@ public function posts($id): JsonResponse
      *
      * @param $id
      * @return mixed
+     *
      * @throws Exception
      */
     public function destroy($id)

diff --git a/src/Http/Controllers/TopicController.php b/src/Http/Controllers/TopicController.php
@@ -42,7 +42,7 @@ public function create(): JsonResponse
     /**
      * Store a newly created resource in storage.
      *
-     * @param TopicRequest $request
+     * @param  TopicRequest  $request
      * @param $id
      * @return JsonResponse
      */
@@ -102,6 +102,7 @@ public function posts($id): JsonResponse
      *
      * @param $id
      * @return mixed
+     *
      * @throws Exception
      */
     public function destroy($id)

diff --git a/src/Http/Controllers/UserController.php b/src/Http/Controllers/UserController.php
@@ -46,7 +46,7 @@ public function create(): JsonResponse
     /**
      * Store a newly created resource in storage.
      *
-     * @param UserRequest $request
+     * @param  UserRequest  $request
      * @param $id
      * @return JsonResponse
      */
@@ -120,6 +120,7 @@ public function posts($id): JsonResponse
      *
      * @param $id
      * @return mixed
+     *
      * @throws Exception
      */
     public function destroy($id)

diff --git a/src/Http/Middleware/Authenticate.php b/src/Http/Middleware/Authenticate.php
@@ -19,7 +19,7 @@ class Authenticate
     /**
      * Create a new middleware instance.
      *
-     * @param Auth $auth
+     * @param  Auth  $auth
      */
     public function __construct(Auth $auth)
     {
@@ -29,9 +29,10 @@ public function __construct(Auth $auth)
     /**
      * Handle the incoming request.
      *
-     * @param Request $request
-     * @param Closure $next
+     * @param  Request  $request
+     * @param  Closure  $next
      * @return mixed
+     *
      * @throws AuthenticationException
      */
     public function handle(Request $request, Closure $next)

diff --git a/src/Listeners/CaptureView.php b/src/Listeners/CaptureView.php
@@ -13,7 +13,7 @@ class CaptureView
      * hour. The ID of the post is stored in session to be validated against
      * until it "expires" and is pruned by the Session middleware class.
      *
-     * @param PostViewed $event
+     * @param  PostViewed  $event
      * @return void
      */
     public function handle(PostViewed $event): void
@@ -35,7 +35,7 @@ public function handle(PostViewed $event): void
     /**
      * Check if a given post exists in the session.
      *
-     * @param Post $post
+     * @param  Post  $post
      * @return bool
      */
     private function wasRecentlyViewed(Post $post): bool
@@ -48,7 +48,7 @@ private function wasRecentlyViewed(Post $post): bool
     /**
      * Add a given post to the session.
      *
-     * @param Post $post
+     * @param  Post  $post
      * @return void
      */
     private function storeInSession(Post $post): void