code clean up

tradecoverexchange · Mar 7, 2021 · b008ded · b008ded
1 parent ad556ee
commit b008ded
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 17 deletions.
diff --git a/src/ConnectionRetrieval.php b/src/ConnectionRetrieval.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Config\Repository;
 use Illuminate\Contracts\Container\BindingResolutionException;
-use Illuminate\Contracts\Container\Container;
 
 trait ConnectionRetrieval
 {
@@ -17,9 +16,8 @@ trait ConnectionRetrieval
      */
     protected function getConfig($name)
     {
-        $container = $this->container ?? app()->make(Container::class);
         if ($name) {
-            return $container->make(Repository::class)->get("queue.connections.{$name}");
+            return $this->container->make(Repository::class)->get("queue.connections.{$name}");
         }
 
         return ['driver' => 'null'];

diff --git a/src/Dispatcher/AppEngineDispatcher.php b/src/Dispatcher/AppEngineDispatcher.php
@@ -44,8 +44,13 @@ public function __construct(Client $client, RequestGenerator $generator, string
      * @param string $queue
      * @throws \Google\ApiCore\ApiException
      */
-    public function dispatch(string $name, string $connection, string $payload, ?int $scheduledAt = null, string $queue = 'default') : void
-    {
+    public function dispatch(
+        string $name,
+        string $connection,
+        string $payload,
+        ?int $scheduledAt = null,
+        string $queue = 'default'
+    ) : void {
         $httpRequest = $this->generator->forAppEngine($payload, $connection);
 
         // Create a Cloud Task object.

diff --git a/src/Dispatcher/HttpDispatcher.php b/src/Dispatcher/HttpDispatcher.php
@@ -24,11 +24,6 @@ class HttpDispatcher implements Dispatcher
      * @var string
      */
     private $locationId;
-
-    /**
-     * @var string
-     */
-    private $serviceEmail;
     /**
      * @var RequestGenerator
      */
@@ -60,8 +55,13 @@ public function __construct(
      * @param string $queue
      * @throws \Google\ApiCore\ApiException
      */
-    public function dispatch(string $name, string $connection, string $payload, ?int $scheduledAt = null, string $queue = 'default'): void
-    {
+    public function dispatch(
+        string $name,
+        string $connection,
+        string $payload,
+        ?int $scheduledAt = null,
+        string $queue = 'default'
+    ) : void {
         $httpRequest = $this->generator->forHttpHandler($payload, $connection);
 
         if ($this->authenticator) {

diff --git a/src/RequestGenerator.php b/src/RequestGenerator.php
@@ -5,6 +5,7 @@
 use Google\Cloud\Tasks\V2beta3\AppEngineHttpRequest;
 use Google\Cloud\Tasks\V2beta3\HttpMethod;
 use Google\Cloud\Tasks\V2beta3\HttpRequest;
+use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Routing\UrlGenerator;
 use Illuminate\Http\Request;
 
@@ -20,11 +21,16 @@ class RequestGenerator
      * @var Request
      */
     private $request;
+    /**
+     * @var Container
+     */
+    private $container;
 
-    public function __construct(UrlGenerator $generator, Request $request)
+    public function __construct(UrlGenerator $generator, Request $request, Container $container)
     {
         $this->generator = $generator;
         $this->request = $request;
+        $this->container = $container;
     }
 
     public function forAppEngine(string $payload, string $connection) : AppEngineHttpRequest

diff --git a/tests/AppEngineJobProcessingTest.php b/tests/AppEngineJobProcessingTest.php
@@ -222,8 +222,6 @@ public function getEnvironmentSetUp($app)
         $app['config']->set('queue', require __DIR__ . '/../config/queue.php');
         $app['config']->set('queue.connections.app_engine_tasks.project_id', 'test');
         $app['config']->set('queue.connections.app_engine_tasks.location', 'europe-west1');
-        $app['config']->set('queue.connections.app_engine_tasks.project_id', 'test');
-        $app['config']->set('queue.connections.app_engine_tasks.location', 'europe-west1');
 
         $app['config']->set('queue.failed.database', 'sqlite');
 

diff --git a/tests/HttpTasksJobProcessingTest.php b/tests/HttpTasksJobProcessingTest.php
@@ -233,8 +233,6 @@ public function getEnvironmentSetUp($app)
         $app['config']->set('queue', require __DIR__ . '/../config/queue.php');
         $app['config']->set('queue.connections.http_cloud_tasks.project_id', 'test');
         $app['config']->set('queue.connections.http_cloud_tasks.location', 'europe-west1');
-        $app['config']->set('queue.connections.app_engine_tasks.project_id', 'test');
-        $app['config']->set('queue.connections.app_engine_tasks.location', 'europe-west1');
 
         $app['config']->set('queue.failed.database', 'sqlite');