public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge branch '1.2'

pull/5688/head
Jordi Boggiano 2016-09-17 13:27:39 +02:00
parent 20ee689bb4 64d29dc6dc
commit 68861c48ed
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Composer/Autoload/AutoloadGenerator.php
View File

@ -526,12 +526,19 @@ EOF;
protected function getAutoloadFile($vendorPathToTargetDirCode, $suffix) protected function getAutoloadFile($vendorPathToTargetDirCode, $suffix)
{ {
$lastChar = $vendorPathToTargetDirCode[strlen($vendorPathToTargetDirCode)-1];
if ("'" === $lastChar || '"' === $lastChar) {
$vendorPathToTargetDirCode = substr($vendorPathToTargetDirCode, 0, -1).'/autoload_real.php'.$lastChar;
} else {
$vendorPathToTargetDirCode .= " . '/autoload_real.php'";
}
return <<<AUTOLOAD return <<<AUTOLOAD
<?php <?php
// autoload.php @generated by Composer // autoload.php @generated by Composer
require_once $vendorPathToTargetDirCode . '/autoload_real.php'; require_once $vendorPathToTargetDirCode;
return ComposerAutoloaderInit$suffix::getLoader(); return ComposerAutoloaderInit$suffix::getLoader();

2
src/Composer/Repository/ComposerRepository.php
View File

@ -88,7 +88,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
$this->config = $config; $this->config = $config;
$this->options = $repoConfig['options']; $this->options = $repoConfig['options'];
$this->url = $repoConfig['url']; $this->url = $repoConfig['url'];
$this->baseUrl = rtrim(preg_replace('{^(.*)(?:/[^/\\]+.json)?(?:[?#].*)?$}', '$1', $this->url), '/'); $this->baseUrl = rtrim(preg_replace('{(?:/[^/\\\\]+\.json)?(?:[?#].*)?$}', '', $this->url), '/');
$this->io = $io; $this->io = $io;
$this->cache = new Cache($io, $config->get('cache-repo-dir').'/'.preg_replace('{[^a-z0-9.]}i', '-', $this->url), 'a-z0-9.$'); $this->cache = new Cache($io, $config->get('cache-repo-dir').'/'.preg_replace('{[^a-z0-9.]}i', '-', $this->url), 'a-z0-9.$');
$this->loader = new ArrayLoader(); $this->loader = new ArrayLoader();

2
tests/Composer/Test/Autoload/Fixtures/autoload_functions.php
View File

@ -2,6 +2,6 @@
// autoload.php @generated by Composer // autoload.php @generated by Composer
require_once __DIR__ . '/composer' . '/autoload_real.php'; require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitFilesAutoload::getLoader(); return ComposerAutoloaderInitFilesAutoload::getLoader();

2
tests/Composer/Test/Autoload/Fixtures/autoload_functions_by_dependency.php
View File

@ -2,6 +2,6 @@
// autoload.php @generated by Composer // autoload.php @generated by Composer
require_once __DIR__ . '/composer' . '/autoload_real.php'; require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitFilesAutoloadOrder::getLoader(); return ComposerAutoloaderInitFilesAutoloadOrder::getLoader();

2
tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php
View File

@ -2,6 +2,6 @@
// autoload.php @generated by Composer // autoload.php @generated by Composer
require_once __DIR__ . '/composer' . '/autoload_real.php'; require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitTargetDir::getLoader(); return ComposerAutoloaderInitTargetDir::getLoader();