Update to latest, with attendant fixes

monicahq · asbiin · Apr 29, 2018 · Mar 18, 2018 · Mar 18, 2018 · Mar 18, 2018
commit 03a14ff38b6403d1f4dfb4a95d23b96cde03041f
diff --git a/app/Account.php b/app/Account.php
@@ -653,7 +653,7 @@ public static function hasAny()
      * @param string $last_name
      * @param string $email
      * @param string $password
-     * @return this
+     * @return $this
      */
     public static function createDefault($first_name, $last_name, $email, $password)
     {
@@ -711,7 +711,7 @@ public function getRelationshipTypeGroupByType(string $relationshipTypeGroupName
     /**
      * Get the statistics of the number of calls grouped by year.
      *
-     * @return json
+     * @return array
      */
     public function getYearlyCallStatistics()
     {
@@ -746,7 +746,7 @@ public function getYearlyCallStatistics()
     /**
      * Get the statistics of the number of activities grouped by year.
      *
-     * @return json
+     * @return array
      */
     public function getYearlyActivitiesStatistics()
     {

diff --git a/app/Contact.php b/app/Contact.php
@@ -2,10 +2,10 @@
 
 namespace App;
 
-use DB;
 use App\Traits\Hasher;
 use App\Traits\Searchable;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Storage;
@@ -414,7 +414,7 @@ public function getInitialsAttribute()
     /**
      * Mutator last_consulted_at.
      *
-     * @param datetime $value
+     * @param \DateTime $value
      */
     public function setLastConsultedAtAttribute($value)
     {

diff --git a/app/Helpers/LocaleHelper.php b/app/Helpers/LocaleHelper.php
@@ -2,7 +2,7 @@
 
 namespace App\Helpers;
 
-use Auth;
+use Illuminate\Support\Facades\Auth;
 
 class LocaleHelper
 {

diff --git a/app/Http/Controllers/Contacts/RelationshipsController.php b/app/Http/Controllers/Contacts/RelationshipsController.php
@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Contacts;
 
-use Validator;
 use App\Contact;
 use App\Relationship;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Validator;
 
 class RelationshipsController extends Controller
 {
@@ -196,7 +196,7 @@ public function edit(Contact $contact, Contact $otherContact)
     /**
      * Update the specified resource in storage.
      *
-     * @param RelationshipsRequest $request
+     * @param Request $request
      * @param Contact $contact
      * @param SignificantOther $significantOther
      * @return \Illuminate\Http\Response

diff --git a/app/Http/Controllers/ContactsController.php b/app/Http/Controllers/ContactsController.php
@@ -9,6 +9,7 @@
 use App\Jobs\ResizeAvatars;
 use App\Helpers\VCardHelper;
 use Illuminate\Http\Request;
+use Barryvdh\Debugbar\Facade as Debugbar;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 
@@ -31,6 +32,8 @@ public function index(Request $request)
 
         $dateFlag = false;
 
+        $date_sort = null;
+
         if (str_contains($sort, 'lastactivitydate')) {
             $date_sort = str_after($sort, 'lastactivitydate');
             $sort = 'firstnameAZ';
@@ -490,7 +493,7 @@ public function search(Request $request)
     public function vCard(Contact $contact)
     {
         if (config('app.debug')) {
-            \Debugbar::disable();
+            Debugbar::disable();
         }
 
         $vcard = VCardHelper::prepareVCard($contact);

diff --git a/app/Http/Resources/Contact/Contact.php b/app/Http/Resources/Contact/Contact.php
@@ -29,19 +29,19 @@ public function toArray($request)
                 'relationships' => $this->when(! $this->is_partial, [
                     'love' => [
                         'total' => (is_null($this->getRelationshipsByRelationshipTypeGroup('love')) ? 0 : $this->getRelationshipsByRelationshipTypeGroup('love')->count()),
-                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('love')) ? null : self::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('love'))),
+                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('love')) ? null : \App\Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('love'))),
                     ],
                     'family' => [
                         'total' => (is_null($this->getRelationshipsByRelationshipTypeGroup('family')) ? 0 : $this->getRelationshipsByRelationshipTypeGroup('family')->count()),
-                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('family')) ? null : self::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('family'))),
+                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('family')) ? null : \App\Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('family'))),
                     ],
                     'friend' => [
                         'total' => (is_null($this->getRelationshipsByRelationshipTypeGroup('friend')) ? 0 : $this->getRelationshipsByRelationshipTypeGroup('friend')->count()),
-                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('friend')) ? null : self::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('friend'))),
+                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('friend')) ? null : \App\Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('friend'))),
                     ],
                     'work' => [
                         'total' => (is_null($this->getRelationshipsByRelationshipTypeGroup('work')) ? 0 : $this->getRelationshipsByRelationshipTypeGroup('work')->count()),
-                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('work')) ? null : self::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('work'))),
+                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('work')) ? null : \App\Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('work'))),
                     ],
                 ]),
                 'dates' => [

diff --git a/app/Http/Resources/Contact/ContactWithContactFields.php b/app/Http/Resources/Contact/ContactWithContactFields.php
@@ -29,19 +29,19 @@ public function toArray($request)
                 'relationships' => $this->when(! $this->is_partial, [
                     'love' => [
                         'total' => $this->getRelationshipsByRelationshipTypeGroup('love')->count(),
-                        'contacts' => Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('love')),
+                        'contacts' => \App\Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('love')),
                     ],
                     'family' => [
                         'total' => $this->getRelationshipsByRelationshipTypeGroup('family')->count(),
-                        'contacts' => Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('family')),
+                        'contacts' => \App\Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('family')),
                     ],
                     'friend' => [
                         'total' => $this->getRelationshipsByRelationshipTypeGroup('friend')->count(),
-                        'contacts' => Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('friend')),
+                        'contacts' => \App\Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('friend')),
                     ],
                     'work' => [
                         'total' => $this->getRelationshipsByRelationshipTypeGroup('work')->count(),
-                        'contacts' => Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('work')),
+                        'contacts' => \App\Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('work')),
                     ],
                 ]),
                 'dates' => [

diff --git a/app/User.php b/app/User.php
@@ -2,9 +2,10 @@
 
 namespace App;
 
-use DB;
 use Carbon\Carbon;
 use Laravel\Passport\HasApiTokens;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\App;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Foundation\Auth\User as Authenticatable;
@@ -58,7 +59,7 @@ public static function createDefault($account_id, $first_name, $last_name, $emai
         $user->password = bcrypt($password);
         $user->timezone = config('app.timezone');
         $user->created_at = now();
-        $user->locale = \App::getLocale();
+        $user->locale = App::getLocale();
         $user->save();
 
         return $user;

diff --git a/database/migrations/2018_03_18_085815_populate_default_relationship_type_tables.php b/database/migrations/2018_03_18_085815_populate_default_relationship_type_tables.php
@@ -1,5 +1,6 @@
 <?php
 
+Use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Migrations\Migration;
 
 class PopulateDefaultRelationshipTypeTables extends Migration

diff --git a/...se/migrations/2018_03_18_090209_populate_relationship_type_tables_with_default_values.php b/...se/migrations/2018_03_18_090209_populate_relationship_type_tables_with_default_values.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Account;
+Use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Migrations\Migration;
 
 class PopulateRelationshipTypeTablesWithDefaultValues extends Migration

diff --git a/...ns/2018_03_18_090345_migrate_current_relationship_table_to_new_relationship_structure.php b/...ns/2018_03_18_090345_migrate_current_relationship_table_to_new_relationship_structure.php
@@ -2,6 +2,7 @@
 
 use App\Account;
 use App\Relationship;
+Use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Migrations\Migration;
 

diff --git a/database/migrations/2018_03_24_083258_migrate_offsprings.php b/database/migrations/2018_03_24_083258_migrate_offsprings.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Account;
+Use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Migrations\Migration;
 

diff --git a/database/migrations/2018_04_04_220850_create_default_modules_table.php b/database/migrations/2018_04_04_220850_create_default_modules_table.php
@@ -1,5 +1,6 @@
 <?php
 
+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_04_13_131008_fix-contacts-data.php b/database/migrations/2018_04_13_131008_fix-contacts-data.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Relationship;
+Use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Migrations\Migration;
 
 class FixContactsData extends Migration

diff --git a/database/migrations/2018_04_13_230536_update_changelog.php b/database/migrations/2018_04_13_230536_update_changelog.php
@@ -1,5 +1,6 @@
 <?php
 
+Use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Migrations\Migration;
 
 class UpdateChangelog extends Migration

diff --git a/psalm.xml b/psalm.xml
@@ -83,6 +83,7 @@
         <!-- level 6 issues - bad stuff here -->
 
         <InvalidNullableReturnType errorLevel="info" />
+        <NullableReturnStatement errorLevel="info" />
         <ImplementedReturnTypeMismatch errorLevel="info" />
         <UnresolvableInclude errorLevel="info" />
         <InvalidReturnStatement errorLevel="info" />

diff --git a/tests/Api/ApiRelationshipTypeControllerTest.php b/tests/Api/ApiRelationshipTypeControllerTest.php
@@ -56,10 +56,6 @@ public function test_it_gets_the_list_of_relationship_types()
         $response->assertStatus(200);
 
         $response->assertJsonFragment([
-            'id' => $relationshipType->id,
-            'object' => 'relationshiptype',
-            'name' => 'father',
-            'delible' => false,
             'id' => $relationshipType2->id,
             'object' => 'relationshiptype',
             'name' => 'son',

diff --git a/tests/Api/ApiRelationshipTypeGroupControllerTest.php b/tests/Api/ApiRelationshipTypeGroupControllerTest.php
@@ -48,10 +48,6 @@ public function test_it_gets_the_list_of_relationship_type_groups()
         $response->assertStatus(200);
 
         $response->assertJsonFragment([
-            'id' => $relationshipTypeGroup->id,
-            'object' => 'relationshiptypegroup',
-            'name' => 'love',
-            'delible' => false,
             'id' => $relationshipTypeGroup2->id,
             'object' => 'relationshiptypegroup',
             'name' => 'hate',

diff --git a/tests/Commands/CommandExecutorTester.php b/tests/Commands/CommandExecutorTester.php
@@ -7,7 +7,7 @@
 class CommandExecutorTester implements CommandExecutorInterface
 {
     /**
-     * @var Collection
+     * @var \Illuminate\Support\Collection
      */
     public $buffer;
 

diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
@@ -2,6 +2,7 @@
 
 namespace Tests;
 
+use Illuminate\Support\Facades\App;
 use Illuminate\Contracts\Console\Kernel;
 
 trait CreatesApplication
@@ -17,7 +18,7 @@ public function createApplication()
 
         $app->make(Kernel::class)->bootstrap();
 
-        \App::setLocale('en');
+        App::setLocale('en');
         \App\Helpers\DateHelper::setLocale('en');
 
         return $app;

diff --git a/tests/Feature/AddressTest.php b/tests/Feature/AddressTest.php
@@ -124,7 +124,7 @@ public function test_users_can_delete_addresses()
         $response = $this->delete('/people/'.$contact->id.'/addresses/'.$address->id);
         $response->assertStatus(200);
 
-        $params['id'] = $address->id;
+        $params = ['id' => $address->id];
 
         $this->assertDatabaseMissing('addresses', $params);
     }

diff --git a/tests/Feature/ContactFieldTest.php b/tests/Feature/ContactFieldTest.php
@@ -98,7 +98,7 @@ public function test_users_can_edit_contact_field()
     {
         list($user, $contact) = $this->fetchUser();
 
-        $params['data'] = 'test_data';
+        $params = ['data' => 'test_data'];
 
         $feild = factory(\App\ContactFieldType::class)->create([
             'account_id' => $user->account_id,
@@ -149,7 +149,7 @@ public function test_users_can_delete_addresses()
         $response = $this->delete('/people/'.$contact->id.'/contactfield/'.$contactField->id);
         $response->assertStatus(200);
 
-        $params['id'] = $contactField->id;
+        $params = ['id' => $contactField->id];
 
         $this->assertDatabaseMissing('contact_fields', $params);
     }

diff --git a/tests/Unit/AccountTest.php b/tests/Unit/AccountTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit;
 
-use DB;
 use App\User;
 use App\Account;
 use App\Reminder;
 use App\Invitation;
 use Tests\FeatureTestCase;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class AccountTest extends FeatureTestCase