Simplify getting target namespace by including appending \

coenjacobs · Sep 9, 2024 · 2cbde92 · 2cbde92
1 parent 15a5bcb
commit 2cbde92
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/Config/Mozart.php b/src/Config/Mozart.php
@@ -5,6 +5,7 @@
 use stdClass;
 use CoenJacobs\Mozart\Config\OverrideAutoload;
 use CoenJacobs\Mozart\Config\Package;
+use Exception;
 
 class Mozart
 {
@@ -92,7 +93,13 @@ public function getDeleteVendorDirectories(): bool
 
     public function getDependencyNamespace(): string
     {
-        return $this->dep_namespace;
+        $namespace = preg_replace("/\\\{2,}$/", "\\", $this->dep_namespace."\\");
+
+        if (empty($namespace)) {
+            throw new Exception('Could not get target dependency namespace');
+        }
+
+        return $namespace;
     }
 
     public function getClassmapPrefix(): string

diff --git a/src/Config/Package.php b/src/Config/Package.php
@@ -40,9 +40,7 @@ public function __construct($path, $overrideAutoload = null)
         $this->path = $path;
 
         if (isset($overrideAutoload)) {
-            $autoload = new Autoload();
-            $autoload->setupAutoloaders($overrideAutoload);
-            $this->set('autoload', $autoload);
+            $this->setAutoload($overrideAutoload);
         }
     }
 

diff --git a/src/Console/Commands/Compose.php b/src/Console/Commands/Compose.php
@@ -67,11 +67,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         $this->config = $config;
-        $this->config->set('dep_namespace', preg_replace(
-            "/\\\{2,}$/",
-            "\\",
-            $this->config->getDependencyNamespace()."\\"
-        ));
 
         $require = $this->config->getPackages();
         if (empty($require)) {