Fix cache + update changed method names after merge

config/ddd.php

@@ -63,6 +63,7 @@
         'factories' => 'Database\Factories',
     ],
 
+    'cache_folder' => 'bootstrap/cache/ddd/',
 
     'autoload' => [
         /*

src/Support/DomainAutoloader.php

@@ -42,14 +42,15 @@ protected function registerDomainServiceProviders(bool|string $domainPath = null
     {
         $domainPath = is_string($domainPath) ? $domainPath : '*/*ServiceProvider.php';
 
-        $serviceProviders = Cache::rememberForever('ddd-domain-service-providers', static function () use ($domainPath){
+        $serviceProviders = $this->remember('ddd-domain-service-providers', static function () use ($domainPath){
             return Arr::map(
-                glob(base_path(DomainResolver::getConfiguredDomainPath().'/'.$domainPath)),
+                glob(base_path(DomainResolver::domainPath().'/'.$domainPath)),
                 (static function ($serviceProvider) {
+
                 return Path::filePathToNamespace(
                     $serviceProvider,
-                    DomainResolver::getConfiguredDomainPath(),
-                    DomainResolver::getConfiguredDomainNamespace()
+                    DomainResolver::domainPath(),
+                    DomainResolver::domainRootNamespace()
                 );
             }));
         });
@@ -63,14 +64,14 @@ protected function registerDomainServiceProviders(bool|string $domainPath = null
     protected function registerDomainCommands(bool|string $domainPath = null): void
     {
         $domainPath = is_string($domainPath) ? $domainPath : '*/Commands/*.php';
-        $commands = Cache::rememberForever('ddd-domain-commands', static function () use ($domainPath){
+        $commands = $this->remember('ddd-domain-commands', static function () use ($domainPath){
             $commands = Arr::map(
-                glob(base_path(DomainResolver::getConfiguredDomainPath().'/'.$domainPath)),
+                glob(base_path(DomainResolver::domainPath().'/'.$domainPath)),
                 static function ($command) {
                     return Path::filePathToNamespace(
                         $command,
-                        DomainResolver::getConfiguredDomainPath(),
-                        DomainResolver::getConfiguredDomainNamespace()
+                        DomainResolver::domainPath(),
+                        DomainResolver::domainRootNamespace()
                     );
             });
 
@@ -103,7 +104,7 @@ protected function registerPolicies(bool|string $domainPath = null): void
                 return null;
             }
 
-            $policy = DomainResolver::getConfiguredDomainNamespace().'\\'.$domain.'\\'.str_replace('{model}', $model, $domainPath);
+            $policy = DomainResolver::domainRootNamespace().'\\'.$domain.'\\'.str_replace('{model}', $model, $domainPath);
 
             return $policy;
         });
@@ -142,7 +143,7 @@ protected function extractDomainAndModelFromModelNamespace(string $modelName): a
     {
         // Matches <DomainNamespace>\{domain}\<ModelNamespace>\{model} and extracts domain and model
         // For example: Domain\Invoicing\Models\Invoice gives ['domain' => 'Invoicing', 'model' => 'Invoice']
-        $regex = '/'.DomainResolver::getConfiguredDomainNamespace().'\\\\(?<domain>.+)\\\\'.$this->config['namespaces.models'].'\\\\(?<model>.+)/';
+        $regex = '/'.DomainResolver::domainRootNamespace().'\\\\(?<domain>.+)\\\\'.$this->config['namespaces.models'].'\\\\(?<model>.+)/';
 
         if (preg_match($regex, $modelName, $matches, PREG_OFFSET_CAPTURE, 0)) {
             return [
@@ -153,4 +154,22 @@ protected function extractDomainAndModelFromModelNamespace(string $modelName): a
 
         return [];
     }
+
+    protected function remember($fileName, $callback)
+    {
+        $cacheFilePath =  base_path($this->cacheDirectory.'/'.$fileName.'.php');
+
+        $data = file_exists($cacheFilePath) ? include $cacheFilePath : null;
+
+        if (is_null($data)) {
+            $data = $callback();
+
+            file_put_contents(
+                $cacheFilePath,
+                '<?php ' . PHP_EOL . 'return ' . var_export($data, true) . ';'
+            );
+        }
+
+        return $data;
+    }
 }

src/Support/Path.php

@@ -21,7 +21,7 @@ public static function join(...$parts)
     public static function filePathToNamespace(string $path, string $namespacePath, string $namespace): string
     {
         return str_replace(
-            [base_path().$namespacePath, '/', '.php'],
+            [base_path().'/'.$namespacePath, '/', '.php'],
             [$namespace, '\\', ''],
             $path
         );