Fix an issue where 'site-' prefix was unnecessarily added to module directories

Author: Teppo Koivula

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.4] - 2019-06-10
+
+### Fixed
+- Fix an issue where 'site-' prefix was unnecessarily added to module directories.
+
 ## [0.0.3] - 2019-06-07
 
 ### Added

src/ComposerInstaller/BaseInstaller.php

@@ -82,11 +82,6 @@ protected function getName(PackageInterface $package) {
             $name = $extra['installer-name'];
         }
 
-        // make sure that the directory name has a site- prefix; if not, add
-        if (strpos($name, 'site-') !== 0) {
-            $name = 'site-' . $name;
-        }
-
         return $name;
     }
 

src/ComposerInstaller/SiteProfileInstaller.php

@@ -60,6 +60,27 @@ public function getInstallPath(PackageInterface $package)
         return $this->getFullPath($package, static::BASE_PATH);
     }
 
+    /**
+     * Get the directory name from package name
+     *
+     * Default directory name can be overridden by specifying extra argument
+     * "installer-name" in the composer.json of the package in question.
+     *
+     * @param PackageInterface $package
+     * @return string Module or site profile name.
+     */
+    protected function getName(PackageInterface $package) {
+        // fetch initial directory name
+        $name = parent::getName($package);
+
+        // make sure that the directory name has a site- prefix; if not, add
+        if (strpos($name, 'site-') !== 0) {
+            $name = 'site-' . $name;
+        }
+
+        return $name;
+    }
+
     /**
      * Get nested site directory path, or null if none found
      *