php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-18 01:07:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

path fix.

Browse Source
This commit is contained in:
Qiang Xue
2013-11-02 23:33:00 -04:00
parent 513037d97d
commit 4c25e7c6ce
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
extensions/composer/Installer.php
View File

@ -85,23 +85,23 @@ class Installer extends LibraryInstaller
protected function generateDefaultAlias(PackageInterface $package) protected function generateDefaultAlias(PackageInterface $package)
{ {
$autoload = $package->getAutoload(); $autoload = $package->getAutoload();
if (!empty($autoload['psr-0'])) { if (empty($autoload['psr-0'])) {
$fs = new Filesystem; return false;
$vendorDir = $fs->normalizePath($this->vendorDir); }
foreach ($autoload['psr-0'] as $name => $path) { $fs = new Filesystem;
$name = str_replace('\\', '/', trim($name, '\\')); $vendorDir = $fs->normalizePath($this->vendorDir);
if (!$fs->isAbsolutePath($path)) { foreach ($autoload['psr-0'] as $name => $path) {
$path = $this->vendorDir . '/' . $path; $name = str_replace('\\', '/', trim($name, '\\'));
} if (!$fs->isAbsolutePath($path)) {
$path = $fs->normalizePath($path); $path = $this->vendorDir . '/' . $package->getName() . '/' . $path;
if (strpos($path . '/', $vendorDir . '/') === 0) { }
return ["@$name" => '<vendor-dir>' . substr($path, strlen($vendorDir)) . '/' . $name]; $path = $fs->normalizePath($path);
} else { if (strpos($path . '/', $vendorDir . '/') === 0) {
return ["@$name" => $path . '/' . $name]; return ["@$name" => '<vendor-dir>' . substr($path, strlen($vendorDir)) . '/' . $name];
} } else {
return ["@$name" => $path . '/' . $name];
} }
} }
return false;
} }
protected function removePackage(PackageInterface $package) protected function removePackage(PackageInterface $package)