Remove need for Container

Author: aarondfrancis

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+### Changed
+- Changed the signature for the Manager class. Remove the requirement for the container to be passed in.
+
 ## 0.4.6 - 2021-07-28
 
 ### Added

src/Manager.php

@@ -6,7 +6,6 @@
 namespace Torchlight;
 
 use Illuminate\Contracts\Cache\Repository;
-use Illuminate\Contracts\Container\Container;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
@@ -27,38 +26,45 @@ class Manager
     protected $cache;
 
     /**
-     * @var Container
+     * @var Client
      */
-    protected $app;
+    protected $client;
 
     /**
      * @var null|string
      */
     protected $environment;
 
     /**
-     * @param Container $app
+     * @param Client $client
+     * @return Manager
      */
-    public function __construct(Container $app)
+    public function setClient(Client $client)
     {
-        $this->app = $app;
+        $this->client = $client;
+
+        return $this;
     }
 
     /**
-     * @param $blocks
-     * @return mixed
+     * @return Client
      */
-    public function highlight($blocks)
+    public function client()
     {
-        return $this->client()->highlight($blocks);
+        if (!$this->client) {
+            $this->client = new Client;
+        }
+
+        return $this->client;
     }
 
     /**
-     * @return Client
+     * @param $blocks
+     * @return mixed
      */
-    public function client()
+    public function highlight($blocks)
     {
-        return $this->app->make(Client::class);
+        return $this->client()->highlight($blocks);
     }
 
     /**

src/TorchlightServiceProvider.php

@@ -23,7 +23,7 @@ public function boot()
     public function bindManagerSingleton()
     {
         $this->app->singleton(Manager::class, function () {
-            return new Manager($this->app);
+            return new Manager;
         });
     }