minor refactorings

Kaishiyoku · Nov 14, 2020 · 504f4c5 · 504f4c5
1 parent 633e38e
commit 504f4c5
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 21 deletions.
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -46,7 +46,7 @@ public function report(Throwable $exception)
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Throwable  $exception
-     * @return \Illuminate\Http\Response
+     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function render($request, Throwable $exception)
     {

diff --git a/app/Http/Controllers/FeedManagerController.php b/app/Http/Controllers/FeedManagerController.php
@@ -178,7 +178,7 @@ public function destroyPermanently(int $id)
     /**
      * Restore the specified resource from storage.
      *
-     * @param int $íd
+     * @param int $id
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */

diff --git a/app/Http/Controllers/FilterKeywordController.php b/app/Http/Controllers/FilterKeywordController.php
@@ -23,7 +23,7 @@ class FilterKeywordController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\View\View
      */
     public function index()
     {
@@ -35,7 +35,7 @@ public function index()
     /**
      * Show the form for creating a new resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\View\View
      */
     public function create()
     {
@@ -48,7 +48,7 @@ public function create()
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(Request $request)
     {
@@ -69,7 +69,7 @@ public function store(Request $request)
      * Remove the specified resource from storage.
      *
      * @param  \App\Models\FilterKeyword  $filterKeyword
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy(FilterKeyword $filterKeyword)
     {

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -23,15 +23,15 @@ public function index()
     }
 
     /**
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\View\View
      */
     public function imprint()
     {
         return view('home.imprint');
     }
 
     /**
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\View\View
      */
     public function showContactForm()
     {
@@ -42,7 +42,7 @@ public function showContactForm()
      * Send the contact form via mail.
      *
      * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function sendContactForm(Request $request)
     {

diff --git a/app/Http/Middleware/Administrate.php b/app/Http/Middleware/Administrate.php
@@ -4,24 +4,24 @@
 
 use Closure;
 use Illuminate\Auth\AuthenticationException;
-use Illuminate\Contracts\Auth\Factory as Auth;
+use Illuminate\Contracts\Auth\Guard;
 
 class Administrate
 {
     /**
      * The authentication factory instance.
      *
-     * @var \Illuminate\Contracts\Auth\Factory
+     * @var Guard
      */
     protected $auth;
 
     /**
      * Create a new middleware instance.
      *
-     * @param  \Illuminate\Contracts\Auth\Factory  $auth
+     * @param  Guard  $auth
      * @return void
      */
-    public function __construct(Auth $auth)
+    public function __construct(Guard $auth)
     {
         $this->auth = $auth;
     }

diff --git a/app/Jobs/ProcessMarkFeedItemAsHidden.php b/app/Jobs/ProcessMarkFeedItemAsHidden.php
@@ -3,12 +3,12 @@
 namespace App\Jobs;
 
 use App\Models\FeedItem;
-use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Carbon;
 
 class ProcessMarkFeedItemAsHidden implements ShouldQueue
 {

diff --git a/app/Libraries/ManualPaginator.php b/app/Libraries/ManualPaginator.php
@@ -10,6 +10,7 @@
 use Illuminate\Support\Traits\ForwardsCalls;
 use IteratorAggregate;
 use JsonSerializable;
+use Traversable;
 
 class ManualPaginator implements Arrayable, ArrayAccess, Countable, IteratorAggregate, JsonSerializable, Jsonable
 {
@@ -94,7 +95,7 @@ public function currentPage()
     }
 
     /**
-     * @return \ArrayIterator
+     * @return Traversable
      */
     public function getIterator()
     {
@@ -284,4 +285,4 @@ public function pages()
             return [$page => $this->getCollectionForPage($page)];
         });
     }
-}
+}
diff --git a/app/Mail/ContactFormSubmitted.php b/app/Mail/ContactFormSubmitted.php
@@ -29,9 +29,9 @@ class ContactFormSubmitted extends Mailable
     /**
      * Create a new message instance.
      *
-     * @param $email
-     * @param $name
-     * @param $content
+     * @param string $email
+     * @param string $name
+     * @param string $content
      */
     public function __construct($email, $name, $content)
     {

diff --git a/app/helpers.php b/app/helpers.php
@@ -37,7 +37,7 @@ function getUnreadFeedItemCountForCategory(Category $category): int
 if (! function_exists('formatBoolean')) {
     function formatBoolean(bool $bool): string
     {
-        if ($bool === true || $bool === 1) {
+        if ($bool) {
             $str = __('common.lists.boolean.1');
         } else {
             $str = __('common.lists.boolean.0');

diff --git a/phpstan.neon b/phpstan.neon
@@ -13,7 +13,6 @@ parameters:
         - '#Unsafe usage of new static#'
 
     excludes_analyse:
-        - ./*/*/FileToBeExcluded.php
         - ./*/*/LoginController.php
         - ./*/*/DailyArticlesChart.php