Adopt PSR-2 coding style

The Laravel framework adopts the PSR-2 coding style in version 5.1. Laravel apps *should* adopt this coding style as well. Read the [PSR-2 coding style guide][1] for more details and check out [PHPCS][2] to use as a code formatting tool. [1]: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md [2]: https://github.com/squizlabs/PHP_CodeSniffer
TheRestartProject · Nov 23, 2018 · 82e9460 · 82e9460
1 parent 8beeb3f
commit 82e9460
Show file tree

Hide file tree

Showing 42 changed files with 67 additions and 73 deletions.
diff --git a/app/Console/Commands/ImportBusinessesCommand.php b/app/Console/Commands/ImportBusinessesCommand.php
@@ -35,7 +35,7 @@ public function handle(CommandBus $commandBus)
         $this->output->writeln('Reading ' . $file);
         $csv = Reader::createFromPath($file);
         $rows = $csv->fetchAssoc();
-        foreach($rows as $row) {
+        foreach ($rows as $row) {
             $commandBus->handle(new ImportFromCsvRowCommand($row));
         }
         $this->output->writeln('Complete');

diff --git a/app/Http/Controllers/Admin/BusinessController.php b/app/Http/Controllers/Admin/BusinessController.php
@@ -26,10 +26,12 @@ public function edit($id = null, BusinessRepository $repository, DoctrineUserRep
     {
         $business = $id ? $repository->findById($id) : new Business();
 
-        if (!empty($business->getCreatedBy()))
+        if (!empty($business->getCreatedBy())) {
             $business->userWhoCreated = $userRepository->find($business->getCreatedBy());
-        if (!empty($business->getUpdatedBy()))
+        }
+        if (!empty($business->getUpdatedBy())) {
             $business->userWhoLastUpdated = $userRepository->find($business->getUpdatedBy());
+        }
 
         $this->authorize('view', $business);
 
@@ -120,7 +122,8 @@ public function scrapeReview(Request $request, ReviewManager $reviewManager)
         return response('', 404);
     }
 
-    private function renderEdit(Business $business, $errors) {
+    private function renderEdit(Business $business, $errors)
+    {
         $isCreate = $business->getUid() === null;
 
         $formAction = $isCreate ? route('admin.business.create') : route('admin.business.update', ['id' => $business->getUid()]);

diff --git a/app/Http/Controllers/BusinessController.php b/app/Http/Controllers/BusinessController.php
@@ -14,8 +14,7 @@ class BusinessController extends Controller
 {
     public function view($id, BusinessRepository $repository)
     {
-        if ($this->isIpRestricted())
-        {
+        if ($this->isIpRestricted()) {
             return response('', 403);
         }
 

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -11,5 +11,4 @@
 class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
-
 }
diff --git a/app/Http/Controllers/MapController.php b/app/Http/Controllers/MapController.php
@@ -9,8 +9,7 @@ class MapController extends Controller
 {
     public function index(Request $request)
     {
-        if ($this->isIpRestricted())
-        {
+        if ($this->isIpRestricted()) {
             return response('', 403);
         }
 

diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -18,7 +18,7 @@ class RedirectIfAuthenticated
     public function handle($request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->check()) {
-           return redirect('/');
+            return redirect('/');
         }
 
         return $next($request);

diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
@@ -41,7 +41,7 @@ public function boot()
         // the 'accessAdmin' right.  The 'can' middleware is used in routes/web.php
         // on the admin routes to check for presence of the 'accessAdmin' right
         // for the current user.
-        Gate::define('accessAdmin', function($user) {
+        Gate::define('accessAdmin', function ($user) {
             $allowedUsersEmails = getenv('ALLOWED_USERS');
             $currentUserEmail = $user->getEmail();
             if ($allowedUsersEmails && $currentUserEmail) {
@@ -72,7 +72,7 @@ public function register()
     {
         $this->app->singleton(UserRepository::class, DoctrineUserRepository::class);
         $this->app->singleton(FixometerSessionRepository::class, DoctrineFixometerSessionRepository::class);
-        $this->app->singleton(FixometerSessionService::class, function($app) {
+        $this->app->singleton(FixometerSessionService::class, function ($app) {
             return new FixometerSessionService(
                 'PHPSESSID',
                 $app->make(CommandBus::class),

diff --git a/app/Providers/BusinessServiceProvider.php b/app/Providers/BusinessServiceProvider.php
@@ -39,5 +39,4 @@ public function register()
         $this->app->singleton(BusinessValidator::class, CustomBusinessValidator::class);
         $this->app->singleton(ImportBusinessAuthorizer::class, LaravelImportBusinessAuthorizer::class);
     }
-
 }
diff --git a/app/Providers/GeocoderServiceProvider.php b/app/Providers/GeocoderServiceProvider.php
@@ -30,4 +30,4 @@ public function register()
             return new GeocoderImpl($this->app->make('geocoder'));
         });
     }
-}
+}
diff --git a/app/Providers/LocationServiceProvider.php b/app/Providers/LocationServiceProvider.php
@@ -29,5 +29,4 @@ public function register()
             return new PlacesApi($key);
         });
     }
-
 }
diff --git a/app/Providers/PhantomServiceProvider.php b/app/Providers/PhantomServiceProvider.php
@@ -37,5 +37,4 @@ public function register()
             return $phantom;
         });
     }
-
 }
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
@@ -63,8 +63,6 @@ protected function mapWebRoutes()
                 Route::prefix('')
                     ->group(base_path('routes/web.php'));
             });
-
-
     }
 
     /**

diff --git a/app/Providers/SuggestionServiceProvider.php b/app/Providers/SuggestionServiceProvider.php
@@ -39,5 +39,4 @@ public function register()
     {
         $this->app->singleton(SuggestionRepository::class, DoctrineSuggestionRepository::class);
     }
-
 }
diff --git a/config/business-criteria.php b/config/business-criteria.php
@@ -36,4 +36,4 @@
             'value' => PublishingStatus::PUBLISHED
         ]
     ]
-];
+];
diff --git a/config/doctrine-mappings.php b/config/doctrine-mappings.php
@@ -159,4 +159,4 @@
             ]
         ]
     ]
-];
+];
diff --git a/config/fixometer.php b/config/fixometer.php
@@ -4,4 +4,4 @@
     'path_to_fixometer_config' => env('FIXOMETER_CONFIG_PATH', 'fixometer/config/config.php'),
     'fixometer.map_admin_roles' => [1, 2, 3],
     'fixometer.map_restarter_roles' => [4]
-];
+];
diff --git a/config/google-analytics.php b/config/google-analytics.php
@@ -2,4 +2,4 @@
 
 return [
     'id' => env('GA_TRACKING_ID')
-];
+];
diff --git a/config/map.php b/config/map.php
@@ -4,9 +4,9 @@
     'radiuses' => [
         1,
         2,
-	//3,
+    //3,
         5,
-	//7,
+    //7,
         10,
         18,
     ],

diff --git a/config/tactician.php b/config/tactician.php
@@ -9,7 +9,6 @@
 use TheRestartProject\RepairDirectory\Application\Commands\Business\DeleteBusiness;
 use \TheRestartProject\RepairDirectory\Application\Commands\Business\ImportFromHttpRequest;
 
-
 return [
 
     'handlers' => [
@@ -35,4 +34,4 @@
     'authorizers' => [
         ImportFromHttpRequest\ImportFromHttpRequestCommand::class => ImportFromHttpRequest\ImportFromHttpRequestAuthorizer::class,
     ]
-];
+];
diff --git a/database/migrations/Version20170809101734.php b/database/migrations/Version20170809101734.php
@@ -26,4 +26,4 @@ public function down(Schema $schema)
 
         $this->addSql('ALTER TABLE businesses DROP city');
     }
-}
+}
diff --git a/database/seeds/BusinessesTableSeeder.php b/database/seeds/BusinessesTableSeeder.php
@@ -20,7 +20,7 @@ public function run()
             'description' => 'PC repairs',
             'address' => '203 Mawney Road',
             'postcode' => 'RM7 8BX',
-            'geolocation' => new Point(51.583626,0.163757),
+            'geolocation' => new Point(51.583626, 0.163757),
             'categories' => [Category::DESKTOP],
             'positiveReviewPc' => 82,
             'publishingStatus' => PublishingStatus::PUBLISHED,
@@ -32,7 +32,7 @@ public function run()
             'description' => 'Laptop repairs',
             'address' => '203 Mawney Road',
             'postcode' => 'RM7 8BX',
-            'geolocation' => new Point(51.583626,0.163757),
+            'geolocation' => new Point(51.583626, 0.163757),
             'categories' => [Category::LAPTOP],
             'positiveReviewPc' => 82,
             'publishingStatus' => PublishingStatus::PUBLISHED,
@@ -44,7 +44,7 @@ public function run()
             'description' => 'Mobile phone shop',
             'address' => '7 Cranbrook Road, Ilford',
             'postcode' => 'IG1 4DU',
-            'geolocation' => new Point(51.5589297,-0.1090134),
+            'geolocation' => new Point(51.5589297, -0.1090134),
             'categories' => [Category::DESKTOP],
             'positiveReviewPc' => 81,
             'publishingStatus' => PublishingStatus::PUBLISHED,

diff --git a/routes/api.php b/routes/api.php
@@ -19,4 +19,3 @@
         Route::get('suggestion/search', 'SuggestionController@search')->name('suggestion.search');
         Route::post('suggestion/add', 'SuggestionController@add')->name('suggestion.add');
     });
-
diff --git a/tests/Browser/Admin/BusinessListTest.php b/tests/Browser/Admin/BusinessListTest.php
@@ -102,5 +102,4 @@ function (Browser $browser) use ($user) {
             }
         );
     }
-
 }
diff --git a/tests/Browser/HomePageTest.php b/tests/Browser/HomePageTest.php
@@ -32,7 +32,6 @@ public function setUp()
     {
         parent::setUp();
         $this->app->make('session')->flush();
-
     }
 
 

diff --git a/tests/DuskTestCase.php b/tests/DuskTestCase.php
@@ -42,7 +42,8 @@ public static function prepare()
     protected function driver()
     {
         return RemoteWebDriver::create(
-            'http://selenium:4444/wd/hub', DesiredCapabilities::chrome()
+            'http://selenium:4444/wd/hub',
+            DesiredCapabilities::chrome()
         );
     }
 
@@ -65,6 +66,4 @@ protected function setUpTraits()
 
         return $uses;
     }
-
-
 }
diff --git a/tests/Feature/Commands/ImportBusinessesCommandTest.php b/tests/Feature/Commands/ImportBusinessesCommandTest.php
@@ -28,13 +28,15 @@ class ImportBusinessesCommandTest extends IntegrationTestCase
     public function it_persists_businesses()
     {
         Artisan::call(
-            'restart:import:businesses', [
+            'restart:import:businesses',
+            [
                 'file' => base_path('data/test.csv')
             ]
         );
 
         $this->assertDatabaseHas(
-            'businesses', [
+            'businesses',
+            [
                 'name' => 'iRepair Centre Bath',
                 'address' => '12 Westgate St',
                 'city' => 'Bath',

diff --git a/tests/Feature/Http/Controllers/Admin/BusinessControllerTest.php b/tests/Feature/Http/Controllers/Admin/BusinessControllerTest.php
@@ -52,7 +52,8 @@ public function i_can_create()
         $response->assertStatus(302);
 
         $this->assertDatabaseHas(
-            'businesses', [
+            'businesses',
+            [
                 'uid' => 1,
                 'name' => $business->getName()
             ]
@@ -92,7 +93,8 @@ public function i_can_update()
         $response->assertStatus(302);
 
         $this->assertDatabaseHas(
-            'businesses', [
+            'businesses',
+            [
                 'uid' => 1,
                 'name' => 'This is a new name',
                 'description' => 'This is a new description.'

diff --git a/tests/Feature/Http/Controllers/Api/BusinessControllerTest.php b/tests/Feature/Http/Controllers/Api/BusinessControllerTest.php
@@ -63,7 +63,8 @@ public function i_can_search_with_category()
     {
         $response = $this->get(
             route(
-                'business.search', [
+                'business.search',
+                [
                     'category' => Category::DESKTOP
                 ]
             )
@@ -96,7 +97,8 @@ public function i_can_search_with_location()
     {
         $response = $this->get(
             route(
-                'business.search', [
+                'business.search',
+                [
                     'location' => 'RM7 7JN'
                 ]
             )
@@ -141,7 +143,8 @@ public function i_can_search_with_category_and_location()
     {
         $response = $this->get(
             route(
-                'business.search', [
+                'business.search',
+                [
                     'category' => Category::DESKTOP,
                     'location' => 'RM7 7JN'
                 ]

diff --git a/tests/Feature/Http/Controllers/Api/SuggestionControllerTest.php b/tests/Feature/Http/Controllers/Api/SuggestionControllerTest.php
@@ -44,7 +44,8 @@ public function i_can_search()
 
         $response = $this->get(
             route(
-                'suggestion.search', [
+                'suggestion.search',
+                [
                 'field' => 'foo'
                 ]
             )
@@ -53,7 +54,8 @@ public function i_can_search()
 
         $response = $this->get(
             route(
-                'suggestion.search', [
+                'suggestion.search',
+                [
                 'prefix' => 'foo'
                 ]
             )
@@ -62,7 +64,8 @@ public function i_can_search()
 
         $response = $this->get(
             route(
-                'suggestion.search', [
+                'suggestion.search',
+                [
                 'field' => 'test',
                 'prefix' => 'foo'
                 ]

diff --git a/tests/Integration/Infrastructure/Doctrine/Listeners/AddSuggestionsListenerTest.php b/tests/Integration/Infrastructure/Doctrine/Listeners/AddSuggestionsListenerTest.php
@@ -26,7 +26,7 @@ class AddSuggestionsListenerTest extends IntegrationTestCase
      * be used to create and update entities and persist
      * the changes.
      *
-     * @var EntityManager 
+     * @var EntityManager
      */
     private $entityManager;
 
@@ -117,5 +117,4 @@ private function assertTestSuggestions()
             ]
         );
     }
-
 }
diff --git a/tests/Unit/Application/CommandBus/LaravelContainerAdapterTest.php b/tests/Unit/Application/CommandBus/LaravelContainerAdapterTest.php
@@ -46,7 +46,8 @@ public function it_can_check_if_a_service_exists_in_the_container()
     {
         $container = new Container();
         $container->singleton(
-            'existingService', function () {
+            'existingService',
+            function () {
                 return new \stdClass();
             }
         );
@@ -67,7 +68,8 @@ public function it_can_get_a_service_out_of_the_container()
     {
         $container = new Container();
         $container->singleton(
-            'service', function () {
+            'service',
+            function () {
                 $service = new \stdClass();
                 $service->foo = 'bar';
                 return $service;
@@ -111,7 +113,8 @@ public function it_throws_an_exception_if_the_container_cannot_produce_the_servi
 
         $container = new Container();
         $container->singleton(
-            'existingService', function () {
+            'existingService',
+            function () {
                 throw new \RuntimeException('Something went wrong');
             }
         );