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

Merge branch '2.2' into main

pull/10701/head
Jordi Boggiano 2022-04-02 13:04:37 +02:00
parent 237eba7ff7 d7f0733959
commit b03e9e414e
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/compile
View File

@ -4,16 +4,28 @@
$cwd = getcwd(); $cwd = getcwd();
assert(is_string($cwd)); assert(is_string($cwd));
chdir(__DIR__.'/../'); chdir(__DIR__.'/../');
$ts = rtrim(shell_exec('git log -n1 --pretty=%ct HEAD')); $ts = rtrim(exec('git log -n1 --pretty=%ct HEAD'));
if (!is_numeric($ts)) { if (!is_numeric($ts)) {
echo 'Could not detect date using "git log -n1 --pretty=%ct HEAD"'.PHP_EOL; echo 'Could not detect date using "git log -n1 --pretty=%ct HEAD"'.PHP_EOL;
exit(1); exit(1);
} }
// Install with the current version to force it having the right ClassLoader version // Install with the current version to force it having the right ClassLoader version
// Install without dev packages to clean up the included classmap from phpunit classes // Install without dev packages to clean up the included classmap from phpunit classes
shell_exec('php bin/composer config autoloader-suffix ComposerPhar' . $ts); exec('php bin/composer config autoloader-suffix ComposerPhar' . $ts, $output, $result);
shell_exec('php bin/composer install -q --no-dev'); if (0 !== $result) {
shell_exec('php bin/composer config autoloader-suffix --unset'); echo 'Could not set the autoloader suffix, make sure exec is allowed and php can be found in your PATH';
exit(1);
}
exec('php bin/composer install -q --no-dev', $output, $result);
if (0 !== $result) {
echo 'Could not remove dev deps, make sure exec is allowed and php can be found in your PATH';
exit(1);
}
exec('php bin/composer config autoloader-suffix --unset', $output, $result);
if (0 !== $result) {
echo 'Could not remove the autoloader suffix, make sure exec is allowed and php can be found in your PATH';
exit(1);
}
chdir($cwd); chdir($cwd);
require __DIR__.'/../src/bootstrap.php'; require __DIR__.'/../src/bootstrap.php';

2
src/Composer/Command/ConfigCommand.php
View File

@ -185,7 +185,7 @@ EOT
$authConfigFile = $input->getOption('global') $authConfigFile = $input->getOption('global')
? ($this->config->get('home') . '/auth.json') ? ($this->config->get('home') . '/auth.json')
: dirname(realpath($configFile)) . '/auth.json'; : dirname($configFile) . '/auth.json';
$this->authConfigFile = new JsonFile($authConfigFile, null, $io); $this->authConfigFile = new JsonFile($authConfigFile, null, $io);
$this->authConfigSource = new JsonConfigSource($this->authConfigFile, true); $this->authConfigSource = new JsonConfigSource($this->authConfigFile, true);

5
tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
View File

@ -1597,7 +1597,10 @@ EOF;
)); ));
$map = $this->generator->buildPackageMap($this->im, $package, array($dep)); $map = $this->generator->buildPackageMap($this->im, $package, array($dep));
$parsed = $this->generator->parseAutoloads($map, $package); $parsed = $this->generator->parseAutoloads($map, $package);
$this->assertSame(array(preg_quote(dirname($this->workingDir)).'/excludedroot($|/)', preg_quote($this->workingDir).'/root/excl($|/)'), $parsed['exclude-from-classmap']); $this->assertSame(array(
preg_quote(strtr((string) realpath(dirname($this->workingDir)), '\\', '/')).'/excludedroot($|/)',
preg_quote(strtr((string) realpath($this->workingDir), '\\', '/')).'/root/excl($|/)'
), $parsed['exclude-from-classmap']);
} }
public function testEmptyPaths(): void public function testEmptyPaths(): void