Revert "fix(installer): remove vendor from target path"

This reverts commit 4b20762.

Author: gaetan-hexadog

README.md

@@ -5,9 +5,9 @@
 This package is a fork of [Laravel Module Installer](https://github.com/joshbrw/laravel-module-installer) to work with Theme packages.
 It allows installation of standalone Theme package into the `themes/` directory instead of `vendor/`.
 
-For example if your Theme package name is `hexadog/admin-theme` then the package will be installed into `themes/admin` directory.
+For example if your Theme package name is `hexadog/admin-theme` then the package will be installed into `themes/hexadog/admin` directory.
 
-You can specify an alternate directory by including a `theme-dir` in the extra data in your root application's composer.json file:
+You can specify an alternate directory by including a `theme-dir` in the extra data in your composer.json file:
 
     "extra": {
         "theme-dir": "custom"

src/ThemeInstaller.php

@@ -24,41 +24,36 @@ public function getInstallPath(PackageInterface $package)
 	}
 
 	/**
-	 * Get the base path that the theme should be installed into.
-	 * Defaults to themes/ and can be overridden in the root project's composer.json.
+	 * Get the base path that the module should be installed into.
+	 * Defaults to Modules/ and can be overridden in the module's composer.json.
 	 * @return string
 	 */
 	protected function getBaseInstallationPath()
 	{
-		if ($this->composer && $this->composer->getPackage()) {
-			$extra = $this->composer->getPackage()->getExtra();
+		if (!$this->composer || !$this->composer->getPackage()) {
+			return 'themes';
+		}
+
+		$extra = $this->composer->getPackage()->getExtra();
 
-			if (array_key_exists('theme-dir', $extra)) {
-				return $extra['theme-dir'];
-			}
+		if (!$extra || empty($extra['theme-dir'])) {
+			return 'themes';
 		}
 
-		return 'themes';
+		return $extra['theme-dir'];
 	}
 
 	/**
 	 * Get the theme name
 	 * 		"something" => "something"
 	 *		"vendor-name/something" => "something"
 	 * 		"vendor-name/something-theme" => "something"
-	 * 
 	 * @param PackageInterface $package
-	 * 
 	 * @return string
+	 * @throws \Exception
 	 */
 	protected function getThemeName(PackageInterface $package)
 	{
-		$name = $package->getPrettyName();
-
-		if (($pos = strpos('/', $name)) !== false) {
-			$name = substr($name, 0, $pos + 1);
-		}
-
 		return str_replace('-theme', '', str_replace('theme-', '', $package->getPrettyName()));
 	}
 }