Merge branch 'main' of github.com:starfolksoftware/ally into main

starfolksoftware · Apr 19, 2022 · ed829a3 · ed829a3
2 parents 186f4c0 + a270a3e
commit ed829a3
Show file tree

Hide file tree

Showing 21 changed files with 25 additions and 26 deletions.
diff --git a/src/Actions/CreateContact.php b/src/Actions/CreateContact.php
@@ -3,8 +3,8 @@
 namespace StarfolkSoftware\Ally\Actions;
 
 use Illuminate\Support\Facades\Validator;
-use StarfolkSoftware\Ally\Contracts\CreatesContacts;
 use StarfolkSoftware\Ally\Ally;
+use StarfolkSoftware\Ally\Contracts\CreatesContacts;
 
 class CreateContact implements CreatesContacts
 {
@@ -44,4 +44,4 @@ public function __invoke($user, array $data, $teamId = null)
             Ally::findTeamByIdOrFail($teamId)->contacts()->create($fields) :
             Ally::newContactModel()->create($fields);
     }
-}
+}
diff --git a/src/Actions/DeleteContact.php b/src/Actions/DeleteContact.php
@@ -2,9 +2,9 @@
 
 namespace StarfolkSoftware\Ally\Actions;
 
+use StarfolkSoftware\Ally\Ally;
 use StarfolkSoftware\Ally\Contact;
 use StarfolkSoftware\Ally\Contracts\DeletesContacts;
-use StarfolkSoftware\Ally\Ally;
 
 class DeleteContact implements DeletesContacts
 {
@@ -27,4 +27,4 @@ public function __invoke($user, Contact $contact)
 
         $contact->delete();
     }
-}
+}
diff --git a/src/Actions/UpdateContact.php b/src/Actions/UpdateContact.php
@@ -3,9 +3,9 @@
 namespace StarfolkSoftware\Ally\Actions;
 
 use Illuminate\Support\Facades\Validator;
+use StarfolkSoftware\Ally\Ally;
 use StarfolkSoftware\Ally\Contact;
 use StarfolkSoftware\Ally\Contracts\UpdatesContacts;
-use StarfolkSoftware\Ally\Ally;
 
 class UpdateContact implements UpdatesContacts
 {
@@ -44,4 +44,4 @@ public function __invoke($user, Contact $contact, array $data)
 
         return $contact->refresh();
     }
-}
+}
diff --git a/src/AllyServiceProvider.php b/src/AllyServiceProvider.php
@@ -7,7 +7,6 @@
 use StarfolkSoftware\Ally\Actions\CreateContact;
 use StarfolkSoftware\Ally\Actions\DeleteContact;
 use StarfolkSoftware\Ally\Actions\UpdateContact;
-use StarfolkSoftware\Ally\Commands\AllyCommand;
 use StarfolkSoftware\Ally\Commands\InstallCommand;
 
 class AllyServiceProvider extends PackageServiceProvider

diff --git a/src/Commands/InstallCommand.php b/src/Commands/InstallCommand.php
@@ -47,4 +47,4 @@ protected function installServiceProviderAfter($after, $name)
             ));
         }
     }
-}
+}
diff --git a/src/Contact.php b/src/Contact.php
@@ -65,4 +65,4 @@ public function entries(string $class): MorphToMany
             'id'
         );
     }
-}
+}
diff --git a/src/Contracts/CreatesContacts.php b/src/Contracts/CreatesContacts.php
@@ -13,4 +13,4 @@ interface CreatesContacts
      * @return \StarfolkSoftware\Ally\Contact
      */
     public function __invoke($user, array $data, $teamId = null);
-}
+}
diff --git a/src/Contracts/UpdatesContacts.php b/src/Contracts/UpdatesContacts.php
@@ -15,4 +15,4 @@ interface UpdatesContacts
      * @return \StarfolkSoftware\Ally\Contact
      */
     public function __invoke($user, Contact $contact, array $data);
-}
+}
diff --git a/src/HasContacts.php b/src/HasContacts.php
@@ -217,4 +217,4 @@ protected function prepareContactIds($contacts): array
 
         return (array) $contacts;
     }
-}
+}
diff --git a/src/Http/Controllers/ContactController.php b/src/Http/Controllers/ContactController.php
@@ -2,11 +2,11 @@
 
 namespace StarfolkSoftware\Ally\Http\Controllers;
 
+use StarfolkSoftware\Ally\Ally;
 use StarfolkSoftware\Ally\Contact;
 use StarfolkSoftware\Ally\Contracts\CreatesContacts;
 use StarfolkSoftware\Ally\Contracts\DeletesContacts;
 use StarfolkSoftware\Ally\Contracts\UpdatesContacts;
-use StarfolkSoftware\Ally\Ally;
 
 class ContactController extends Controller
 {
@@ -66,4 +66,4 @@ public function destroy(Contact $contact, DeletesContacts $deletesContacts)
             request()->get('redirect', Ally::redirects('destroy', '/'))
         );
     }
-}
+}
diff --git a/src/Http/Controllers/Controller.php b/src/Http/Controllers/Controller.php
@@ -12,4 +12,4 @@ class Controller extends BaseController
     use AuthorizesRequests;
     use DispatchesJobs;
     use ValidatesRequests;
-}
+}
diff --git a/tests/Feature/Actions/CreateContactTest.php b/tests/Feature/Actions/CreateContactTest.php
@@ -32,4 +32,4 @@
 
     expect($tax->refresh())
         ->name->toBe('Contact');
-});
+});
diff --git a/tests/Feature/Actions/CreateContactWithTeamTest.php b/tests/Feature/Actions/CreateContactWithTeamTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use StarfolkSoftware\Ally\Contracts\CreatesContacts;
 use StarfolkSoftware\Ally\Ally;
+use StarfolkSoftware\Ally\Contracts\CreatesContacts;
 use StarfolkSoftware\Ally\Tests\Mocks\TeamModel;
 use StarfolkSoftware\Ally\Tests\Mocks\TestUser;
 
@@ -48,4 +48,4 @@
 
     expect($team->refresh()->contacts()->count())
         ->toBe(1);
-});
+});
diff --git a/tests/Feature/Actions/DeleteContactTest.php b/tests/Feature/Actions/DeleteContactTest.php
@@ -18,4 +18,4 @@
     $deletesContacts($user, $category);
 
     expect(Contact::count())->toEqual(0);
-});
+});
diff --git a/tests/Feature/Actions/UpdateContactTest.php b/tests/Feature/Actions/UpdateContactTest.php
@@ -36,4 +36,4 @@
 
     expect($contact->refresh())
         ->name->toBe('Contact');
-});
+});
diff --git a/tests/Feature/ContactTest.php b/tests/Feature/ContactTest.php
@@ -65,4 +65,4 @@
     $response->assertRedirect('/redirect/path');
 
     expect(Contact::count())->toEqual(0);
-});
+});
diff --git a/tests/Feature/HasContactsTest.php b/tests/Feature/HasContactsTest.php
@@ -61,4 +61,4 @@
     expect($product->contacts()->count())->toBe(0);
 
     expect(TestProduct::withoutAnyContacts()->count())->toBe(5);
-});
+});
diff --git a/tests/Mocks/TeamModel.php b/tests/Mocks/TeamModel.php
@@ -10,4 +10,4 @@ class TeamModel extends Model
     use TeamHasContacts;
 
     protected $table = 'teams';
-}
+}
diff --git a/tests/Mocks/TestProduct.php b/tests/Mocks/TestProduct.php
@@ -12,4 +12,4 @@ class TestProduct extends Model
     use HasContacts;
 
     protected $table = 'products';
-}
+}
diff --git a/tests/Mocks/TestUser.php b/tests/Mocks/TestUser.php
@@ -7,4 +7,4 @@
 class TestUser extends User
 {
     protected $table = 'users';
-}
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -65,4 +65,4 @@ protected function createUser()
             'password' => 'test',
         ]);
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,4 +47,4 @@ protected function installServiceProviderAfter($after, $name) @@
                 ));
             }
         }
-    }
+    }