Fix $namespacePath -> $packageName

And rename variables for better understandinf
BrianHenryIE · Dec 14, 2020 · 8788118 · 8788118
1 parent c795e97
commit 8788118
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/Mover.php b/src/Mover.php
@@ -177,26 +177,25 @@ public function moveFile(Package $package, $autoloader, $file, $path = '')
         // The relative path to the file from the project root.
         $sourceFilePath = $this->clean(str_replace($this->workingDir, '', $file->getPathname()));
 
-        $namespacePath = $this->clean($package->config->name);
+        $packageName = $this->clean($package->config->name);
 
         if ($autoloader instanceof NamespaceAutoloader) {
             $namespacePath = $this->clean($autoloader->getNamespacePath());
 
             // TODO: Should $path come from the NameSpaceAutoloader object?
-            $packageVendorPath = 'vendor' . DIRECTORY_SEPARATOR . $namespacePath
-                                 . DIRECTORY_SEPARATOR . $this->clean($path);
+	        $sourceVendorPath = $this->clean('vendor' . DIRECTORY_SEPARATOR . $packageName
+                                 . DIRECTORY_SEPARATOR . $path);
 
-            $mozartDepPath = $this->dep_directory . DIRECTORY_SEPARATOR . $namespacePath;
+	        $destinationMozartPath = $this->dep_directory . DIRECTORY_SEPARATOR . $namespacePath;
 
-            $targetFilePath = str_ireplace($packageVendorPath, $mozartDepPath, $sourceFilePath);
+            $targetFilePath = str_ireplace($sourceVendorPath, $destinationMozartPath, $sourceFilePath);
         } else {
-            $classmapDirectory = $this->classmap_directory;
 
-            $packageVendorPath = 'vendor' . DIRECTORY_SEPARATOR . $namespacePath;
+            $sourceVendorPath = 'vendor' . DIRECTORY_SEPARATOR . $packageName;
 
-            $mozartClassesPath = $classmapDirectory . DIRECTORY_SEPARATOR . $namespacePath;
+            $destinationMozartPath = $this->classmap_directory . DIRECTORY_SEPARATOR . $packageName;
 
-            $targetFilePath = str_ireplace($packageVendorPath, $mozartClassesPath, $sourceFilePath);
+            $targetFilePath = str_ireplace($sourceVendorPath, $destinationMozartPath, $sourceFilePath);
         }
 
         $this->filesystem->copy($sourceFilePath, $targetFilePath);