tests

src/Facades/Config.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Siteworxpro\App\Facades;
 
+use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\Facades\Facade;
 use Siteworx\Config\Exception\EmptyDirectoryException;
 use Siteworx\Config\Exception\FileNotFoundException;
@@ -21,6 +22,10 @@ use Siteworx\Config\Exception\UnsupportedFormatException;
  */
 class Config extends Facade
 {
+
+    protected static $cached = false;
+
+
     /**
      * @throws UnsupportedFormatException
      * @throws FileNotFoundException
@@ -28,6 +33,17 @@ class Config extends Facade
      */
     public static function getFacadeRoot(): \Siteworx\Config\Config
     {
+        if (self::$resolvedInstance !== null) {
+            try {
+                $config = self::resolveFacadeInstance(self::getFacadeAccessor());
+                if ($config instanceof \Siteworx\Config\Config) {
+                    return $config;
+                }
+            } catch (BindingResolutionException) {
+            }
+
+        }
+
         return \Siteworx\Config\Config::load(__DIR__ . '/../../config.php');
     }
 
@@ -38,6 +54,6 @@ class Config extends Facade
      */
     protected static function getFacadeAccessor(): string
     {
-        return 'config';
+        return \Siteworx\Config\Config::class;
     }
 }

src/Facades/Logger.php

@@ -24,6 +24,15 @@ class Logger extends Facade
 {
     public static function getFacadeRoot(): RRLogger
     {
+        if (self::$resolvedInstance !== null) {
+            $logger = self::resolveFacadeInstance(self::getFacadeAccessor());
+
+            if ($logger instanceof RRLogger) {
+                return $logger;
+            }
+        }
+
+
         $rpc = RPC::create('tcp://127.0.0.1:6001');
 
         return new RRLogger($rpc);