Use resolve() for resolving IoC stuff instead of app()->make()

WaveHack · Mar 29, 2017 · 1d0293d · 1d0293d
1 parent 9d0b6df
commit 1d0293d
Show file tree

Hide file tree

Showing 20 changed files with 68 additions and 68 deletions.
diff --git a/src/Calculators/Dominion/BuildingCalculator.php b/src/Calculators/Dominion/BuildingCalculator.php
@@ -18,8 +18,8 @@ class BuildingCalculator extends AbstractDominionCalculator
      */
     public function initDependencies()
     {
-        $this->buildingHelper = app()->make(BuildingHelper::class);
-        $this->landCalculator = app()->make(LandCalculator::class);
+        $this->buildingHelper = resolve(BuildingHelper::class);
+        $this->landCalculator = resolve(LandCalculator::class);
     }
 
     /**

diff --git a/src/Calculators/Dominion/LandCalculator.php b/src/Calculators/Dominion/LandCalculator.php
@@ -26,10 +26,10 @@ class LandCalculator extends AbstractDominionCalculator
      */
     public function initDependencies()
     {
-        $this->buildingHelper = app()->make(BuildingHelper::class);
-        $this->landHelper = app()->make(LandHelper::class);
-        $this->buildingCalculator = app()->make(BuildingCalculator::class);
-        $this->dominionQueueService = app()->make(DominionQueueService::class);
+        $this->buildingHelper = resolve(BuildingHelper::class);
+        $this->landHelper = resolve(LandHelper::class);
+        $this->buildingCalculator = resolve(BuildingCalculator::class);
+        $this->dominionQueueService = resolve(DominionQueueService::class);
     }
 
     /**

diff --git a/src/Calculators/Dominion/MilitaryCalculator.php b/src/Calculators/Dominion/MilitaryCalculator.php
@@ -14,7 +14,7 @@ class MilitaryCalculator extends AbstractDominionCalculator
      */
     public function initDependencies()
     {
-        $this->landCalculator = app()->make(LandCalculator::class);
+        $this->landCalculator = resolve(LandCalculator::class);
     }
 
     /**

diff --git a/src/Calculators/Dominion/PopulationCalculator.php b/src/Calculators/Dominion/PopulationCalculator.php
@@ -18,8 +18,8 @@ class PopulationCalculator extends AbstractDominionCalculator
      */
     public function initDependencies()
     {
-        $this->buildingHelper = app()->make(BuildingHelper::class);
-        $this->landCalculator = app()->make(LandCalculator::class);
+        $this->buildingHelper = resolve(BuildingHelper::class);
+        $this->landCalculator = resolve(LandCalculator::class);
     }
 
     /**

diff --git a/src/Calculators/Dominion/ProductionCalculator.php b/src/Calculators/Dominion/ProductionCalculator.php
@@ -14,7 +14,7 @@ class ProductionCalculator extends AbstractDominionCalculator
      */
     public function initDependencies()
     {
-        $this->populationCalculator = app()->make(PopulationCalculator::class);
+        $this->populationCalculator = resolve(PopulationCalculator::class);
     }
 
     /**

diff --git a/src/Calculators/NetworthCalculator.php b/src/Calculators/NetworthCalculator.php
@@ -22,8 +22,8 @@ class NetworthCalculator implements DependencyInitializableInterface
      */
     public function initDependencies()
     {
-        $this->buildingCalculator = app()->make(BuildingCalculator::class);
-        $this->landCalculator = app()->make(LandCalculator::class);
+        $this->buildingCalculator = resolve(BuildingCalculator::class);
+        $this->landCalculator = resolve(LandCalculator::class);
     }
 
     /**

diff --git a/src/Console/Commands/GameTickCommand.php b/src/Console/Commands/GameTickCommand.php
@@ -47,9 +47,9 @@ public function __construct(DominionRepository $dominions)
         parent::__construct();
 
         $this->dominions = $dominions;
-        $this->populationCalculator = app()->make(PopulationCalculator::class);
-        $this->productionCalculator = app()->make(ProductionCalculator::class);
-        $this->networthCalculator = app()->make(NetworthCalculator::class);
+        $this->populationCalculator = resolve(PopulationCalculator::class);
+        $this->productionCalculator = resolve(ProductionCalculator::class);
+        $this->networthCalculator = resolve(NetworthCalculator::class);
     }
 
     /**

diff --git a/src/Http/Controllers/Auth/LoginController.php b/src/Http/Controllers/Auth/LoginController.php
@@ -28,12 +28,12 @@ public function postLogin(Request $request)
     protected function authenticated(Request $request, User $user)
     {
         if ($user->dominions->count() === 1) {
-            $dominionSelectorService = app()->make(DominionSelectorService::class);
+            $dominionSelectorService = resolve(DominionSelectorService::class);
             $dominionSelectorService->selectUserDominion($user->dominions->first());
         }
 
         // todo: fire laravel event
-        $analyticsService = app()->make(AnalyticsService::class);
+        $analyticsService = resolve(AnalyticsService::class);
         $analyticsService->queueFlashEvent(new AnalyticsService\Event(
             'user',
             'login'
@@ -45,7 +45,7 @@ public function postLogout(Request $request)
         $response = $this->logout($request);
 
         // todo: fire laravel event
-        $analyticsService = app()->make(AnalyticsService::class);
+        $analyticsService = resolve(AnalyticsService::class);
         $analyticsService->queueFlashEvent(new AnalyticsService\Event(
             'user',
             'logout'

diff --git a/src/Http/Controllers/Auth/RegisterController.php b/src/Http/Controllers/Auth/RegisterController.php
@@ -41,7 +41,7 @@ public function postRegister(Request $request)
         Mail::to($user->email)->send(new UserRegistrationMail($user));
 
         // todo: fire laravel event
-        $analyticsService = app()->make(AnalyticsService::class);
+        $analyticsService = resolve(AnalyticsService::class);
         $analyticsService->queueFlashEvent(new AnalyticsService\Event(
             'user',
             'register'
@@ -71,7 +71,7 @@ public function getActivate($activation_code)
 
         auth()->login($user);
 
-        $analyticsService = app()->make(AnalyticsService::class);
+        $analyticsService = resolve(AnalyticsService::class);
         $analyticsService->queueFlashEvent(new AnalyticsService\Event(
             'user',
             'activate'

diff --git a/src/Http/Controllers/DebugController.php b/src/Http/Controllers/DebugController.php
@@ -17,12 +17,12 @@ public function getIndex()
             return redirect()->route('dominion.status');
         }
 
-        $buildingCalculator = app()->make(BuildingCalculator::class);
-        $landCalculator = app()->make(LandCalculator::class);
-        $militaryCalculator = app()->make(MilitaryCalculator::class);
-        $populationCalculator = app()->make(PopulationCalculator::class);
-        $productionCalculator = app()->make(ProductionCalculator::class);
-        $networthCalculator = app()->make(NetworthCalculator::class);
+        $buildingCalculator = resolve(BuildingCalculator::class);
+        $landCalculator = resolve(LandCalculator::class);
+        $militaryCalculator = resolve(MilitaryCalculator::class);
+        $populationCalculator = resolve(PopulationCalculator::class);
+        $productionCalculator = resolve(ProductionCalculator::class);
+        $networthCalculator = resolve(NetworthCalculator::class);
 
         $networthCalculator->initDependencies();
 

diff --git a/src/Http/Controllers/DominionController.php b/src/Http/Controllers/DominionController.php
@@ -27,7 +27,7 @@ class DominionController extends AbstractController
 {
     public function postSelect(Dominion $dominion)
     {
-        $dominionSelectorService = app()->make(DominionSelectorService::class);
+        $dominionSelectorService = resolve(DominionSelectorService::class);
 
         try {
             $dominionSelectorService->selectUserDominion($dominion);
@@ -37,7 +37,7 @@ public function postSelect(Dominion $dominion)
         }
 
         // todo: fire laravel event
-        $analyticsService = app()->make(AnalyticsService::class);
+        $analyticsService = resolve(AnalyticsService::class);
         $analyticsService->queueFlashEvent(new AnalyticsService\Event(
             'dominion',
             'select'
@@ -50,8 +50,8 @@ public function postSelect(Dominion $dominion)
 
     public function getStatus()
     {
-        $landCalculator = app()->make(LandCalculator::class);
-        $populationCalculator = app()->make(PopulationCalculator::class);
+        $landCalculator = resolve(LandCalculator::class);
+        $populationCalculator = resolve(PopulationCalculator::class);
 
         // todo: make status view a partial for here + other dominion status and include stuff like OOP here
 
@@ -68,8 +68,8 @@ public function getAdvisors()
 
     public function getAdvisorsProduction()
     {
-        $populationCalculator = app()->make(PopulationCalculator::class);
-        $productionCalculator = app()->make(ProductionCalculator::class);
+        $populationCalculator = resolve(PopulationCalculator::class);
+        $productionCalculator = resolve(ProductionCalculator::class);
 
         return view('pages.dominion.advisors.production', compact(
             'populationCalculator',
@@ -84,9 +84,9 @@ public function getAdvisorsMilitary()
 
     public function getAdvisorsLand()
     {
-        $landHelper = app()->make(LandHelper::class);
-        $landCalculator = app()->make(LandCalculator::class);
-        $dominionQueueService = app()->make(DominionQueueService::class);
+        $landHelper = resolve(LandHelper::class);
+        $landCalculator = resolve(LandCalculator::class);
+        $dominionQueueService = resolve(DominionQueueService::class);
 
         return view('pages.dominion.advisors.land', compact(
             'landHelper',
@@ -97,10 +97,10 @@ public function getAdvisorsLand()
 
     public function getAdvisorsConstruction()
     {
-        $buildingHelper = app()->make(BuildingHelper::class);
-        $buildingCalculator = app()->make(BuildingCalculator::class);
-        $landCalculator = app()->make(LandCalculator::class);
-        $dominionQueueService = app()->make(DominionQueueService::class);
+        $buildingHelper = resolve(BuildingHelper::class);
+        $buildingCalculator = resolve(BuildingCalculator::class);
+        $landCalculator = resolve(LandCalculator::class);
+        $dominionQueueService = resolve(DominionQueueService::class);
 
         return view('pages.dominion.advisors.construction', compact(
             'buildingHelper',
@@ -114,9 +114,9 @@ public function getAdvisorsConstruction()
 
     public function getExplore()
     {
-        $landHelper = app()->make(LandHelper::class);
-        $landCalculator = app()->make(LandCalculator::class);
-        $dominionQueueService = app()->make(DominionQueueService::class);
+        $landHelper = resolve(LandHelper::class);
+        $landCalculator = resolve(LandCalculator::class);
+        $dominionQueueService = resolve(DominionQueueService::class);
         $dominionQueueService->setDominion($this->getSelectedDominion());
 
         return view('pages.dominion.explore', compact(
@@ -129,7 +129,7 @@ public function getExplore()
     public function postExplore(ExploreActionRequest $request)
     {
         $dominion = $this->getSelectedDominion();
-        $explorationActionService = app()->make(ExplorationActionService::class);
+        $explorationActionService = resolve(ExplorationActionService::class);
 
         try {
             $result = $explorationActionService->explore($dominion, $request->get('explore'));
@@ -162,7 +162,7 @@ public function postExplore(ExploreActionRequest $request)
         );
 
         // todo: fire laravel event
-        $analyticsService = app()->make(AnalyticsService::class);
+        $analyticsService = resolve(AnalyticsService::class);
         $analyticsService->queueFlashEvent(new AnalyticsService\Event(
             'dominion',
             'explore',
@@ -176,10 +176,10 @@ public function postExplore(ExploreActionRequest $request)
 
     public function getConstruction()
     {
-        $buildingHelper = app()->make(BuildingHelper::class);
-        $buildingCalculator = app()->make(BuildingCalculator::class);
-        $landCalculator = app()->make(LandCalculator::class);
-        $dominionQueueService = app()->make(DominionQueueService::class);
+        $buildingHelper = resolve(BuildingHelper::class);
+        $buildingCalculator = resolve(BuildingCalculator::class);
+        $landCalculator = resolve(LandCalculator::class);
+        $dominionQueueService = resolve(DominionQueueService::class);
         $dominionQueueService->setDominion($this->getSelectedDominion());
 
         return view('pages.dominion.construction', compact(
@@ -193,7 +193,7 @@ public function getConstruction()
     public function postConstruction(/*ConstructionActionRequest*/ Request $request)
     {
         $dominion = $this->getSelectedDominion();
-        $constructionActionService = app()->make(ConstructionActionService::class);
+        $constructionActionService = resolve(ConstructionActionService::class);
 
         try {
             $result = $constructionActionService->construct($dominion, $request->get('construct'));
@@ -225,7 +225,7 @@ public function postConstruction(/*ConstructionActionRequest*/ Request $request)
         );
 
         // todo: fire laravel event
-        $analyticsService = app()->make(AnalyticsService::class);
+        $analyticsService = resolve(AnalyticsService::class);
         $analyticsService->queueFlashEvent(new AnalyticsService\Event(
             'dominion',
             'construct',
@@ -245,8 +245,8 @@ public function postConstruction(/*ConstructionActionRequest*/ Request $request)
 
     public function getRealm(Realm $realm = null)
     {
-        $landCalculator = app()->make(LandCalculator::class);
-        $networthCalculator = app()->make(NetworthCalculator::class);
+        $landCalculator = resolve(LandCalculator::class);
+        $networthCalculator = resolve(NetworthCalculator::class);
 
         if (!$realm->exists) {
             $realm = $this->getSelectedDominion()->realm;
@@ -283,8 +283,8 @@ public function getRealm(Realm $realm = null)
 
 //    public function getOtherStatus(Dominion $dominion)
 //    {
-//        $landCalculator = app()->make(LandCalculator::class);
-//        $populationCalculator = app()->make(PopulationCalculator::class);
+//        $landCalculator = resolve(LandCalculator::class);
+//        $populationCalculator = resolve(PopulationCalculator::class);
 //
 //        $landCalculator->setDominion($dominion);
 //        $populationCalculator->setDominion($dominion);
@@ -301,7 +301,7 @@ public function getRealm(Realm $realm = null)
      */
     protected function getSelectedDominion()
     {
-        $dominionSelectorService = app()->make(DominionSelectorService::class);
+        $dominionSelectorService = resolve(DominionSelectorService::class);
         return $dominionSelectorService->getUserSelectedDominion();
     }
 }
diff --git a/src/Http/Controllers/HomeController.php b/src/Http/Controllers/HomeController.php
@@ -10,7 +10,7 @@ class HomeController extends AbstractController
     public function getIndex()
     {
         if (Auth::check()) {
-            $dominionSelectorService = app()->make(DominionSelectorService::class);
+            $dominionSelectorService = resolve(DominionSelectorService::class);
 
             if ($dominionSelectorService->hasUserSelectedDominion()) {
                 return redirect()->route('dominion.status');

diff --git a/src/Http/Controllers/RoundController.php b/src/Http/Controllers/RoundController.php
@@ -58,11 +58,11 @@ public function postRegister(Request $request, Round $round)
             $request->get('dominion_name')
         );
 
-        $dominionSelectorService = app()->make(DominionSelectorService::class);
+        $dominionSelectorService = resolve(DominionSelectorService::class);
         $dominionSelectorService->selectUserDominion($dominion);
 
         // todo: fire laravel event
-        $analyticsService = app()->make(AnalyticsService::class);
+        $analyticsService = resolve(AnalyticsService::class);
         $analyticsService->queueFlashEvent(new AnalyticsService\Event(
             'round',
             'register',

diff --git a/src/Http/Requests/Dominion/Actions/ExploreActionRequest.php b/src/Http/Requests/Dominion/Actions/ExploreActionRequest.php
@@ -13,7 +13,7 @@ class ExploreActionRequest extends FormRequest
 
     public function __construct()
     {
-        $this->landHelper = app()->make(LandHelper::class);
+        $this->landHelper = resolve(LandHelper::class);
     }
 
     /**

diff --git a/src/Models/Dominion.php b/src/Models/Dominion.php
@@ -34,7 +34,7 @@ public function user()
     public function isSelectedByAuthUser()
     {
         // todo: repository criteria?
-        $dominionSelectorService = app()->make(DominionSelectorService::class);
+        $dominionSelectorService = resolve(DominionSelectorService::class);
 
         $selectedDominion = $dominionSelectorService->getUserSelectedDominion();
 

diff --git a/src/Providers/ComposerServiceProvider.php b/src/Providers/ComposerServiceProvider.php
@@ -23,7 +23,7 @@ public function boot()
         });
 
         view()->composer('partials.resources-overview', function (View $view) {
-            $networthCalculator = app()->make(NetworthCalculator::class);
+            $networthCalculator = resolve(NetworthCalculator::class);
             $networthCalculator->initDependencies();
             $view->with('networthCalculator', $networthCalculator);
         });

diff --git a/src/Services/Actions/ConstructionActionService.php b/src/Services/Actions/ConstructionActionService.php
@@ -29,14 +29,14 @@ public function construct(Dominion $dominion, array $data)
         $data = array_map('intval', $data);
 
         /** @var LandHelper $landHelper */
-        $landHelper = app()->make(LandHelper::class);
+        $landHelper = resolve(LandHelper::class);
 
         /** @var BuildingCalculator $buildingCalculator */
-        $buildingCalculator = app()->make(BuildingCalculator::class);
+        $buildingCalculator = resolve(BuildingCalculator::class);
         $buildingCalculator->init($dominion);
 
         /** @var LandCalculator $landCalculator */
-        $landCalculator = app()->make(LandCalculator::class);
+        $landCalculator = resolve(LandCalculator::class);
         $landCalculator->init($dominion);
 
         $totalBuildingsToConstruct = array_sum($data);

diff --git a/src/Services/Actions/ExplorationActionService.php b/src/Services/Actions/ExplorationActionService.php
@@ -27,7 +27,7 @@ public function explore(Dominion $dominion, array $data)
         $data = array_map('intval', $data);
 
         /** @var LandCalculator $landCalculator */
-        $landCalculator = app()->make(LandCalculator::class);
+        $landCalculator = resolve(LandCalculator::class);
         $landCalculator->init($dominion);
 
         $totalLandToExplore = array_sum($data);

diff --git a/src/Services/DominionQueueService.php b/src/Services/DominionQueueService.php
@@ -28,8 +28,8 @@ class DominionQueueService
      */
     public function __construct()
     {
-        $this->buildingHelper = app()->make(BuildingHelper::class);
-        $this->landHelper = app()->make(LandHelper::class);
+        $this->buildingHelper = resolve(BuildingHelper::class);
+        $this->landHelper = resolve(LandHelper::class);
     }
 
     // Exploration

diff --git a/tests/Feature/DominionTest.php b/tests/Feature/DominionTest.php
@@ -47,7 +47,7 @@ public function testUserCanSeeStatusPage()
         $user = $this->createAndImpersonateUser();
         $round = $this->createRound();
         $dominion = $this->createDominion($user, $round);
-        $dominionSelectorService = app()->make(DominionSelectorService::class);
+        $dominionSelectorService = resolve(DominionSelectorService::class);
 
         $dominionSelectorService->selectUserDominion($dominion);