Browse Source

fixed composer targetdir

tags/2.0.0-beta
Carsten Brandt 11 years ago
parent
commit
5425dc92c6
  1. 5
      extensions/composer/Installer.php

5
extensions/composer/Installer.php

@ -113,10 +113,11 @@ class Installer extends LibraryInstaller
$path = $this->vendorDir . '/' . $package->getName() . '/' . $path; $path = $this->vendorDir . '/' . $package->getName() . '/' . $path;
} }
$path = $fs->normalizePath($path); $path = $fs->normalizePath($path);
$targetDir = $package->getTargetDir();
if (strpos($path . '/', $vendorDir . '/') === 0) { if (strpos($path . '/', $vendorDir . '/') === 0) {
$aliases["@$name"] = '<vendor-dir>' . substr($path, strlen($vendorDir)) . '/' . $name; $aliases["@$name"] = '<vendor-dir>' . ($targetDir === null ? '': '/' . $targetDir) . substr($path, strlen($vendorDir));
} else { } else {
$aliases["@$name"] = $path . '/' . $name; $aliases["@$name"] = $path . ($targetDir === null ? '': '/' . $targetDir);
} }
} }
return $aliases; return $aliases;

Loading…
Cancel
Save