From 5425dc92c6ce3eea5953a9bced79af02856f1e94 Mon Sep 17 00:00:00 2001 From: Carsten Brandt Date: Sun, 1 Dec 2013 01:17:59 +0100 Subject: [PATCH] fixed composer targetdir --- extensions/composer/Installer.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/composer/Installer.php b/extensions/composer/Installer.php index d8d799f..fb66d16 100644 --- a/extensions/composer/Installer.php +++ b/extensions/composer/Installer.php @@ -113,10 +113,11 @@ class Installer extends LibraryInstaller $path = $this->vendorDir . '/' . $package->getName() . '/' . $path; } $path = $fs->normalizePath($path); + $targetDir = $package->getTargetDir(); if (strpos($path . '/', $vendorDir . '/') === 0) { - $aliases["@$name"] = '' . substr($path, strlen($vendorDir)) . '/' . $name; + $aliases["@$name"] = '' . ($targetDir === null ? '': '/' . $targetDir) . substr($path, strlen($vendorDir)); } else { - $aliases["@$name"] = $path . '/' . $name; + $aliases["@$name"] = $path . ($targetDir === null ? '': '/' . $targetDir); } } return $aliases;