Update Psalm and fix issues found (#1486)

monicahq · Jul 8, 2018 · f8fe374 · f8fe374
1 parent bffe121
commit f8fe374
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 23 deletions.
diff --git a/app/Helpers/MoneyHelper.php b/app/Helpers/MoneyHelper.php
@@ -14,7 +14,7 @@ class MoneyHelper
      * defined, then the amount will be returned without a currency symbol.
      *
      * @param  int|null     $amount   Amount to format.
-     * @param  App\Currency $currency Currency of amount.
+     * @param  Currency     $currency Currency of amount.
      * @return string                 Amount formatted with currency symbol.
      */
     public static function format($amount, Currency $currency = null)

diff --git a/app/Http/Controllers/Settings/PersonalizationController.php b/app/Http/Controllers/Settings/PersonalizationController.php
@@ -56,7 +56,7 @@ public function storeContactFieldType(Request $request)
     /**
      * Edit a newly created resource in storage.
      *
-     * @param ContactFieldTypeRequest $request
+     * @param Request $request
      * @param string $contactFieldTypeId
      * @return \Illuminate\Http\Response
      */

diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
@@ -17,6 +17,7 @@
 use App\Models\Contact\Reminder;
 use App\Models\Contact\ContactField;
 use App\Models\Contact\ReminderRule;
+use App\Models\Journal\JournalEntry;
 use Illuminate\Support\Facades\Route;
 use App\Models\Relationship\Relationship;
 use Illuminate\Database\Eloquent\ModelNotFoundException;

diff --git a/composer.json b/composer.json
@@ -53,7 +53,7 @@
         "roave/security-advisories": "dev-master",
         "symfony/css-selector": "~4.0",
         "symfony/dom-crawler": "~4.0",
-        "vimeo/psalm": "^1.1"
+        "vimeo/psalm": "^2.0"
     },
     "suggest": {
         "ext-apcu": "*"

diff --git a/composer.lock b/composer.lock
diff --git a/database/migrations/2018_05_06_061227_external_countries.php b/database/migrations/2018_05_06_061227_external_countries.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Models\Contact\Address;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;

diff --git a/database/migrations/2018_05_20_121028_accept_terms.php b/database/migrations/2018_05_20_121028_accept_terms.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Models\User\User;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Database\Migrations\Migration;
 
 class AcceptTerms extends Migration
@@ -14,6 +15,7 @@ public function up()
     {
         User::chunk(200, function ($users) {
             foreach ($users as $user) {
+                Log::info($user->id);
                 if ($user->account) {
                     $user->acceptPolicy();
                 }

diff --git a/database/seeds/FakeContentTableSeeder.php b/database/seeds/FakeContentTableSeeder.php
@@ -93,8 +93,8 @@ public function run()
         $progress->finish();
 
         // create the second test, blank account
-        $this->blankAccount = Account::createDefault('Blank', 'State', 'blank@blank.com', 'blank');
-        $blankUser = $this->blankAccount->users()->first();
+        $blankAccount = Account::createDefault('Blank', 'State', 'blank@blank.com', 'blank');
+        $blankUser = $blankAccount->users()->first();
         $this->confirmUser($blankUser);
     }
 

diff --git a/psalm.xml b/psalm.xml
@@ -10,6 +10,9 @@
         <directory name="app" />
         <directory name="routes" />
         <directory name="tests" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
     </projectFiles>
 
     <issueHandlers>
@@ -76,7 +79,7 @@
         <TooManyArguments errorLevel="info" />
         <TypeDoesNotContainType errorLevel="info" />
         <InvalidOperand errorLevel="info" />
-        <MoreSpecificImplementedReturnType errorLevel="info" />
+        <LessSpecificImplementedReturnType errorLevel="info" />
         <MoreSpecificImplementedParamType errorLevel="info" />
 
         <!-- level 6 issues - bad stuff here -->
@@ -87,7 +90,6 @@
         <UnresolvableInclude errorLevel="info" />
         <InvalidReturnStatement errorLevel="info" />
         <InvalidReturnType errorLevel="info" />
-        <UndefinedThisPropertyAssignment errorLevel="info" />
 
         <InvalidArgument errorLevel="info" />
 
@@ -99,5 +101,24 @@
                 <directory name="resources/views" />
             </errorLevel>
         </UndefinedGlobalVariable>
+
+        <UndefinedPropertyAssignment>
+            <errorLevel type="suppress">
+                <file name="app/Models/Contact/Contact.php" />
+            </errorLevel>
+        </UndefinedPropertyAssignment>
+
+        <UndefinedThisPropertyFetch>
+            <errorLevel type="suppress">
+                <file name="tests/DuskTestCase.php" />
+            </errorLevel>
+        </UndefinedThisPropertyFetch>
+
+        <UndefinedPropertyFetch>
+            <errorLevel type="suppress">
+                <file name="app/Models/Account/Event.php" />
+                <file name="app/Models/Contact/Contact.php" />
+            </errorLevel>
+        </UndefinedPropertyFetch>
     </issueHandlers>
 </psalm>