Merge branch 'master' of https://github.com/writingink/wink

Author: themsaid

readme.md

@@ -10,19 +10,19 @@ Wink runs on any Laravel application, it uses a separate database connection and
 
 To install Wink, require it via Composer:
 
-```
+```sh
 composer require writingink/wink
 ```
 
 Once Composer is done, run the following command:
 
-```
+```sh
 php artisan wink:install
 ```
 
 Check `config/wink.php` and **configure the database connection** wink is going to be using. Then instead of running `php artisan migrate`, run:
 
-```
+```sh
 php artisan wink:migrate
 ```
 
@@ -40,13 +40,13 @@ Head to `yourproject.test/wink` and use the provided email and password to log i
 
 Add this command in your deployment script so that wink runs new migrations if any:
 
-```
+```sh
 php artisan wink:migrate
 ```
 
 You may also want to run this command to re-publish the assets:
 
-```
+```sh
 php artisan vendor:publish --tag=wink-assets --force
 ```
 

src/Http/Controllers/ForgotPasswordController.php

@@ -48,6 +48,7 @@ public function sendResetLinkEmail()
     /**
      * Show the new password to the user.
      *
+     * @param  string  $token
      * @return \Illuminate\Http\Response
      */
     public function showNewPassword($token)

src/Http/Controllers/ImageUploadsController.php

@@ -15,7 +15,7 @@ public function upload()
     {
         $path = request()->image->store(config('wink.storage_path'), [
                 'disk' => config('wink.storage_disk'),
-                'visibility' => 'public'
+                'visibility' => 'public',
             ]
         );
 

src/Http/Controllers/LoginController.php

@@ -24,7 +24,7 @@ public function showLoginForm()
     /**
      * Log the user out of the application.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function logout(Request $request)

src/Http/Controllers/PagesController.php

@@ -12,7 +12,7 @@ class PagesController
     /**
      * Return pages.
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection|\Illuminate\Http\JsonResponse
      */
     public function index()
     {
@@ -28,7 +28,7 @@ public function index()
     /**
      * Return a single page.
      *
-     * @param  string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function show($id = null)
@@ -49,7 +49,7 @@ public function show($id = null)
     /**
      * Store a single page.
      *
-     * @param  string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function store($id)
@@ -80,8 +80,8 @@ public function store($id)
     /**
      * Delete a single page.
      *
-     * @param  string $id
-     * @return null
+     * @param  string  $id
+     * @return void
      */
     public function delete($id)
     {

src/Http/Controllers/PostsController.php

@@ -13,7 +13,7 @@ class PostsController
     /**
      * Return posts.
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection|\Illuminate\Http\JsonResponse
      */
     public function index()
     {
@@ -38,7 +38,7 @@ public function index()
     /**
      * Return a single post.
      *
-     * @param  string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function show($id = null)
@@ -59,7 +59,7 @@ public function show($id = null)
     /**
      * Store a single post.
      *
-     * @param  string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function store($id)
@@ -102,7 +102,7 @@ public function store($id)
     /**
      * Tags incoming from the request.
      *
-     * @param  array $incomingTags
+     * @param  array  $incomingTags
      * @return array
      */
     private function collectTags($incomingTags)
@@ -127,8 +127,8 @@ private function collectTags($incomingTags)
     /**
      * Return a single post.
      *
-     * @param  string $id
-     * @return null
+     * @param  string  $id
+     * @return void
      */
     public function delete($id)
     {

src/Http/Controllers/TagsController.php

@@ -12,7 +12,7 @@ class TagsController
     /**
      * Return posts.
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection|\Illuminate\Http\JsonResponse
      */
     public function index()
     {
@@ -83,7 +83,7 @@ public function store($id)
      * Return a single tag.
      *
      * @param  string  $id
-     * @return null
+     * @return void
      */
     public function delete($id)
     {

src/Http/Controllers/TeamController.php

@@ -13,7 +13,7 @@ class TeamController
     /**
      * Return posts.
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection|\Illuminate\Http\JsonResponse
      */
     public function index()
     {
@@ -30,7 +30,7 @@ public function index()
     /**
      * Return a single post.
      *
-     * @param  string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function show($id = null)
@@ -53,7 +53,7 @@ public function show($id = null)
     /**
      * Store a single category.
      *
-     * @param  string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function store($id)
@@ -98,7 +98,7 @@ public function store($id)
     /**
      * Return a single author.
      *
-     * @param  string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse|null
      */
     public function delete($id)

src/Http/Resources/PagesResource.php

@@ -9,7 +9,7 @@ class PagesResource extends JsonResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request  $request
      * @return array
      */
     public function toArray($request)

src/Http/Resources/PostsResource.php

@@ -9,7 +9,7 @@ class PostsResource extends JsonResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request  $request
      * @return array
      */
     public function toArray($request)

src/Http/Resources/TagsResource.php

@@ -9,7 +9,7 @@ class TagsResource extends JsonResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request  $request
      * @return array
      */
     public function toArray($request)

src/Http/Resources/TeamResource.php

@@ -9,7 +9,7 @@ class TeamResource extends JsonResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request  $request
      * @return array
      */
     public function toArray($request)

src/WinkPost.php

@@ -81,7 +81,7 @@ public function author()
     /**
      * Scope a query to only include published posts.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
      * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopePublished($query)
@@ -92,7 +92,7 @@ public function scopePublished($query)
     /**
      * Scope a query to only include drafts (unpublished posts).
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
      * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopeDraft($query)
@@ -103,46 +103,46 @@ public function scopeDraft($query)
     /**
      * Scope a query to only include posts whose publish date is in the past (or now).
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
      * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopeLive($query)
     {
-        return $query->published()->where('publish_date', "<=", now());
+        return $query->published()->where('publish_date', '<=', now());
     }
 
     /**
      * Scope a query to only include posts whose publish date is in the future.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
      * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopeScheduled($query)
     {
-        return $query->where('publish_date', ">", now());
+        return $query->where('publish_date', '>', now());
     }
 
     /**
      * Scope a query to only include posts whose publish date is before a given date.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     * @param string $date
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param  string  $date
      * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopeBeforePublishDate($query, $date)
     {
-        return $query->where('publish_date', "<=", $date);
+        return $query->where('publish_date', '<=', $date);
     }
 
     /**
      * Scope a query to only include posts whose publish date is after a given date.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     * @param string $date
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param  string  $date
      * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopeAfterPublishDate($query, $date)
     {
-        return $query->where('publish_date', ">", $date);
+        return $query->where('publish_date', '>', $date);
     }
 }