Refactored Voyager

.gitignore

@@ -3,3 +3,4 @@
 vendor
 build
 .lock
+composer.lock

src/Voyager.php

@@ -2,73 +2,37 @@
 
 namespace TCG\Voyager;
 
+use TCG\Voyager\Models\User;
+use TCG\Voyager\Models\Setting;
+use TCG\Voyager\Models\Permission;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\File;
+use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Facades\Storage;
 use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
-use TCG\Voyager\Models\Permission;
-use TCG\Voyager\Models\Setting;
-use TCG\Voyager\Models\User;
 
 class Voyager
 {
-    /**
-     *  Singleton Voyager Class.
-     */
     private static $instance;
 
-    public static function getInstance()
-    {
-        if (null === static::$instance) {
-            static::$instance = new static();
-        }
+    protected $version;
+    protected $filesystem;
 
-        return static::$instance;
-    }
-
-    public function getVersion()
+    public function __construct()
     {
-        $composer_lock = __DIR__.'/../../../../composer.lock';
-        $version = null;
+        $this->filesystem = app(Filesystem::class);
 
-        if (File::exists($composer_lock)) {
-            // Get the composer.lock file
-            $file = json_decode(
-                File::get($composer_lock)
-            );
-
-            // Loop through all the packages and get the version of voyager
-            foreach ($file->packages as $package) {
-                if ($package->name == 'tcg/voyager') {
-                    $version = $package->version;
-                    break;
-                }
-            }
-        }
-
-        return $version;
+        $this->findVersion();
     }
 
-    protected function __construct()
-    {
-    }
-
-    private function __clone()
+    public static function getInstance()
     {
-    }
+        if (null === static::$instance) {
+            static::$instance = new static();
+        }
 
-    private function __wakeup()
-    {
+        return static::$instance;
     }
 
-    /**
-     *  End Singleton operators.
-     *
-     * @param $key
-     * @param null $default
-     *
-     * @return null
-     */
     public static function setting($key, $default = null)
     {
         $setting = Setting::where('key', '=', $key)->first();
@@ -105,4 +69,31 @@ public static function can($permission)
             }
         }
     }
+
+    public function getVersion()
+    {
+        return $this->version;
+    }
+
+    protected function findVersion()
+    {
+        if (!is_null($this->version)) {
+            return;
+        }
+
+        if ($this->filesystem->exists(base_path('composer.lock'))) {
+            // Get the composer.lock file
+            $file = json_decode(
+                $this->filesystem->get(base_path('composer.lock'))
+            );
+
+            // Loop through all the packages and get the version of voyager
+            foreach ($file->packages as $package) {
+                if ($package->name == 'tcg/voyager') {
+                    $this->version = $package->version;
+                    break;
+                }
+            }
+        }
+    }
 }