uses Container contract instead of Application contract #2

ssi-anik · Feb 8, 2022 · b12844c · b12844c
1 parent 7b31675
commit b12844c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/AmqpFake.php b/src/AmqpFake.php
@@ -6,7 +6,7 @@
 use Anik\Amqp\Qos\Qos;
 use Anik\Amqp\Queues\Queue;
 use Anik\Laravel\Amqp\Exceptions\LaravelAmqpException;
-use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\Container\Container;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use PHPUnit\Framework\Assert;
@@ -17,7 +17,7 @@ class AmqpFake extends AmqpManager implements AmqpPubSub
     protected $activeConnection;
     protected $connections;
 
-    public function __construct(Application $app)
+    public function __construct(Container $app)
     {
         parent::__construct($app);
         $this->messages = [];

diff --git a/src/AmqpManager.php b/src/AmqpManager.php
@@ -4,16 +4,19 @@
 
 use Anik\Amqp\AmqpConnectionFactory;
 use Anik\Laravel\Amqp\Exceptions\LaravelAmqpException;
-use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Config\Repository;
+use Illuminate\Contracts\Container\Container;
 use PhpAmqpLib\Connection\AMQPLazySSLConnection;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 class AmqpManager
 {
     protected $app;
 
     protected $connections;
 
-    public function __construct(Application $app)
+    public function __construct(Container $app)
     {
         $this->app = $app;
     }
@@ -37,7 +40,13 @@ protected function getDefaultConnection(): string
 
     protected function config($key, $default = null)
     {
-        return $this->app['config'][$key] ?? $default;
+        try {
+            $repository = $this->app->get('config');
+        } catch (NotFoundExceptionInterface | ContainerExceptionInterface $e) {
+            return $default;
+        }
+
+        return $repository instanceof Repository ? $repository->get($key, $default) : $default;
     }
 
     protected function resolve(string $name): AmqpPubSub