Fix some scrutiniser issues.

2025-02-25 18:45:27 -06:00 · 2017-01-14 19:43:33 +01:00 · 2017-01-14 19:43:33 +01:00 · 08ac27cccf
commit 08ac27cccf
parent 0b5cab99cf
14 changed files with 44 additions and 28 deletions
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@ -111,9 +111,9 @@ class Handler extends ExceptionHandler
    /**
     * Convert an authentication exception into an unauthenticated response.
     *
-     * @param  \Illuminate\Http\Request $request
+     * @param $request
     *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
     */
    protected function unauthenticated($request)
    {
--- a/app/Helpers/Attachments/AttachmentHelper.php
+++ b/app/Helpers/Attachments/AttachmentHelper.php
@ -32,9 +32,9 @@ class AttachmentHelper implements AttachmentHelperInterface
    /** @var MessageBag */
    public $messages;
    /** @var array */
-    protected $allowedMimes;
+    protected $allowedMimes = [];
    /** @var int */
-    protected $maxUploadSize;
+    protected $maxUploadSize = 0;

    /** @var \Illuminate\Contracts\Filesystem\Filesystem */
    protected $uploadDisk;
@ -44,8 +44,8 @@ class AttachmentHelper implements AttachmentHelperInterface
     */
    public function __construct()
    {
-        $this->maxUploadSize = config('firefly.maxUploadSize');
-        $this->allowedMimes  = config('firefly.allowedMimes');
+        $this->maxUploadSize = intval(config('firefly.maxUploadSize'));
+        $this->allowedMimes  = (array) config('firefly.allowedMimes');
        $this->errors        = new MessageBag;
        $this->messages      = new MessageBag;
        $this->uploadDisk    = Storage::disk('upload');
--- a/app/Helpers/Collector/JournalCollector.php
+++ b/app/Helpers/Collector/JournalCollector.php
@ -167,6 +167,7 @@ class JournalCollector implements JournalCollectorInterface
    public function getJournals(): Collection
    {
        $this->run = true;
+        /** @var Collection $set */
        $set       = $this->query->get(array_values($this->fields));
        Log::debug(sprintf('Count of set is %d', $set->count()));
        $set = $this->filterTransfers($set);
--- a/app/Http/Controllers/AttachmentController.php
+++ b/app/Http/Controllers/AttachmentController.php
@ -18,6 +18,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Requests\AttachmentFormRequest;
 use FireflyIII\Models\Attachment;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
+use Illuminate\Http\Response as LaravelResponse;
 use Preferences;
 use Response;
 use Session;
@ -100,7 +101,9 @@ class AttachmentController extends Controller
            $content = $repository->getContent($attachment);
            $quoted  = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));

-            return response($content, 200)
+            /** @var LaravelResponse $response */
+            $response = response($content, 200);
+            $response
                ->header('Content-Description', 'File Transfer')
                ->header('Content-Type', 'application/octet-stream')
                ->header('Content-Disposition', 'attachment; filename=' . $quoted)
@ -110,6 +113,8 @@ class AttachmentController extends Controller
                ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
                ->header('Pragma', 'public')
                ->header('Content-Length', strlen($content));
+
+            return $response;
        }
        throw new FireflyException('Could not find the indicated attachment. The file is no longer there.');
    }
--- a/app/Http/Controllers/ExportController.php
+++ b/app/Http/Controllers/ExportController.php
@ -24,6 +24,7 @@ use FireflyIII\Models\ExportJob;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface;
 use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface as EJRI;
+use Illuminate\Http\Response as LaravelResponse;
 use Preferences;
 use Response;
 use View;
@ -73,8 +74,9 @@ class ExportController extends Controller


        $job->change('export_downloaded');
-
-        return response($content, 200)
+        /** @var LaravelResponse $response */
+        $response = response($content, 200);
+        $response
            ->header('Content-Description', 'File Transfer')
            ->header('Content-Type', 'application/octet-stream')
            ->header('Content-Disposition', 'attachment; filename=' . $quoted)
@ -85,6 +87,8 @@ class ExportController extends Controller
            ->header('Pragma', 'public')
            ->header('Content-Length', strlen($content));

+        return $response;
+
    }

    /**
@ -128,8 +132,7 @@ class ExportController extends Controller
     * @param AccountRepositoryInterface $repository
     * @param EJRI                       $jobs
     *
-     * @return string
-     *
+     * @return \Illuminate\Http\JsonResponse
     */
    public function postIndex(ExportFormRequest $request, AccountRepositoryInterface $repository, EJRI $jobs)
    {
--- a/app/Http/Controllers/ImportController.php
+++ b/app/Http/Controllers/ImportController.php
@ -21,6 +21,7 @@ use FireflyIII\Models\ImportJob;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response as LaravelResponse;
 use Log;
 use Response;
 use Session;
@ -120,15 +121,18 @@ class ImportController extends Controller
        $result                            = json_encode($config, JSON_PRETTY_PRINT);
        $name                              = sprintf('"%s"', addcslashes('import-configuration-' . date('Y-m-d') . '.json', '"\\'));

-        return response($result, 200)
-            ->header('Content-disposition', 'attachment; filename=' . $name)
-            ->header('Content-Type', 'application/json')
-            ->header('Content-Description', 'File Transfer')
-            ->header('Connection', 'Keep-Alive')
-            ->header('Expires', '0')
-            ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
-            ->header('Pragma', 'public')
-            ->header('Content-Length', strlen($result));
+        /** @var LaravelResponse $response */
+        $response = response($result, 200);
+        $response->header('Content-disposition', 'attachment; filename=' . $name)
+                 ->header('Content-Type', 'application/json')
+                 ->header('Content-Description', 'File Transfer')
+                 ->header('Connection', 'Keep-Alive')
+                 ->header('Expires', '0')
+                 ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
+                 ->header('Pragma', 'public')
+                 ->header('Content-Length', strlen($result));
+
+        return $response;


    }
--- a/app/Http/Controllers/Transaction/SingleController.php
+++ b/app/Http/Controllers/Transaction/SingleController.php
@ -265,6 +265,7 @@ class SingleController extends Controller

            return redirect(route('transactions.create', [$request->input('what')]))->withInput();
        }
+        /** @var array $files */
        $files = $request->hasFile('attachments') ? $request->file('attachments') : null;
        $this->attachments->saveAttachmentsForModel($journal, $files);

@ -315,6 +316,7 @@ class SingleController extends Controller

        $data    = $request->getJournalData();
        $journal = $repository->update($journal, $data);
+        /** @var array $files */
        $files   = $request->hasFile('attachments') ? $request->file('attachments') : null;
        $this->attachments->saveAttachmentsForModel($journal, $files);

--- a/app/Http/Controllers/Transaction/SplitController.php
+++ b/app/Http/Controllers/Transaction/SplitController.php
@ -138,6 +138,7 @@ class SplitController extends Controller

        $data    = $this->arrayFromInput($request);
        $journal = $repository->updateSplitJournal($journal, $data);
+        /** @var array $files */
        $files   = $request->hasFile('attachments') ? $request->file('attachments') : null;
        // save attachments:
        $this->attachments->saveAttachmentsForModel($journal, $files);
--- a/app/Repositories/Account/AccountRepository.php
+++ b/app/Repositories/Account/AccountRepository.php
@ -477,7 +477,6 @@ class AccountRepository implements AccountRepositoryInterface
    }

    /**
-     * @param float  $amount
     * @param string $name
     *
     * @return Account
--- a/app/Repositories/RuleGroup/RuleGroupRepository.php
+++ b/app/Repositories/RuleGroup/RuleGroupRepository.php
@ -49,8 +49,8 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
    }

    /**
-     * @param RuleGroup $ruleGroup
-     * @param RuleGroup $moveTo
+     * @param RuleGroup      $ruleGroup
+     * @param RuleGroup|null $moveTo
     *
     * @return bool
     */
--- a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php
+++ b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php
@ -35,8 +35,8 @@ interface RuleGroupRepositoryInterface
    public function count(): int;

    /**
-     * @param RuleGroup $ruleGroup
-     * @param RuleGroup $moveTo
+     * @param RuleGroup      $ruleGroup
+     * @param RuleGroup|null $moveTo
     *
     * @return bool
     */
--- a/app/Rules/Triggers/AbstractTrigger.php
+++ b/app/Rules/Triggers/AbstractTrigger.php
@ -74,6 +74,8 @@ class AbstractTrigger
        return $self;
    }

+
+
    /**
     * @param RuleTrigger        $trigger
     * @param TransactionJournal $journal
--- a/app/Support/Amount.php
+++ b/app/Support/Amount.php
@ -90,11 +90,11 @@ class Amount
                $pos_c = $sign;
        }

-        // default: (amount before currency)
+        // default is amount before currency
        $format = $pos_a . $pos_d . '%v' . $space . $pos_b . '%s' . $pos_c . $pos_e;

        if ($csPrecedes) {
-            // (currency before amount)
+            // alternative is currency before amount
            $format = $pos_a . $pos_b . '%s' . $pos_c . $space . $pos_d . '%v' . $pos_e;
        }
        Log::debug(sprintf('Final format: "%s"', $format));
--- a/app/Support/ExpandedForm.php
+++ b/app/Support/ExpandedForm.php
@ -285,7 +285,6 @@ class ExpandedForm

    /**
     * @param       $name
-     * @param null  $value
     * @param array $options
     *
     * @return string