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

Move improvements towards reproducible builds, refs #3927

pull/3991/head
Jordi Boggiano 2015-05-01 11:54:55 +01:00
parent 92785ac677
commit ebffb3c179
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Composer/Compiler.php
View File

@ -51,9 +51,8 @@ class Compiler
throw new \RuntimeException('Can\'t run git log. You must ensure to run compile from composer git repository clone and that git binary is available.'); throw new \RuntimeException('Can\'t run git log. You must ensure to run compile from composer git repository clone and that git binary is available.');
} }
$date = new \DateTime(trim($process->getOutput())); $this->versionDate = new \DateTime(trim($process->getOutput()));
$date->setTimezone(new \DateTimeZone('UTC')); $this->versionDate->setTimezone(new \DateTimeZone('UTC'));
$this->versionDate = $date->format('Y-m-d H:i:s');
$process = new Process('git describe --tags --exact-match HEAD'); $process = new Process('git describe --tags --exact-match HEAD');
if ($process->run() == 0) { if ($process->run() == 0) {
@ -74,7 +73,7 @@ class Compiler
$phar->startBuffering(); $phar->startBuffering();
$finderSort = function ($a, $b) { $finderSort = function ($a, $b) {
return strcmp($a, $b); return strcmp(strtr($a->getRealPath(), '\\', '/'), strtr($b->getRealPath(), '\\', '/'));
}; };
$finder = new Finder(); $finder = new Finder();
@ -160,7 +159,7 @@ class Compiler
if ($path === 'src/Composer/Composer.php') { if ($path === 'src/Composer/Composer.php') {
$content = str_replace('@package_version@', $this->version, $content); $content = str_replace('@package_version@', $this->version, $content);
$content = str_replace('@package_branch_alias_version@', $this->branchAliasVersion, $content); $content = str_replace('@package_branch_alias_version@', $this->branchAliasVersion, $content);
$content = str_replace('@release_date@', $this->versionDate, $content); $content = str_replace('@release_date@', $this->versionDate->format('Y-m-d H:i:s'), $content);
} }
$phar->addFromString($path, $content); $phar->addFromString($path, $content);
@ -236,9 +235,9 @@ Phar::mapPhar('composer.phar');
EOF; EOF;
// add warning once the phar is older than 30 days // add warning once the phar is older than 60 days
if (preg_match('{^[a-f0-9]+$}', $this->version)) { if (preg_match('{^[a-f0-9]+$}', $this->version)) {
$warningTime = time() + 30*86400; $warningTime = $this->versionDate->format('U') + 60 * 86400;
$stub .= "define('COMPOSER_DEV_WARNING_TIME', $warningTime);\n"; $stub .= "define('COMPOSER_DEV_WARNING_TIME', $warningTime);\n";
} }

2
src/Composer/Console/Application.php
View File

@ -104,7 +104,7 @@ class Application extends BaseApplication
} }
if ($commandName !== 'self-update' && $commandName !== 'selfupdate') { if ($commandName !== 'self-update' && $commandName !== 'selfupdate') {
if (time() > COMPOSER_DEV_WARNING_TIME) { if (time() > COMPOSER_DEV_WARNING_TIME) {
$this->getIO()->writeError(sprintf('<warning>Warning: This development build of composer is over 30 days old. It is recommended to update it by running "%s self-update" to get the latest version.</warning>', $_SERVER['PHP_SELF'])); $this->getIO()->writeError(sprintf('<warning>Warning: This development build of composer is over 60 days old. It is recommended to update it by running "%s self-update" to get the latest version.</warning>', $_SERVER['PHP_SELF']));
} }
} }
} }

2
tests/Composer/Test/ApplicationTest.php
View File

@ -30,7 +30,7 @@ class ApplicationTest extends TestCase
$outputMock->expects($this->once()) $outputMock->expects($this->once())
->method("write") ->method("write")
->with($this->equalTo(sprintf('<warning>Warning: This development build of composer is over 30 days old. It is recommended to update it by running "%s self-update" to get the latest version.</warning>', $_SERVER['PHP_SELF']))); ->with($this->equalTo(sprintf('<warning>Warning: This development build of composer is over 60 days old. It is recommended to update it by running "%s self-update" to get the latest version.</warning>', $_SERVER['PHP_SELF'])));
if (!defined('COMPOSER_DEV_WARNING_TIME')) { if (!defined('COMPOSER_DEV_WARNING_TIME')) {
define('COMPOSER_DEV_WARNING_TIME', time() - 1); define('COMPOSER_DEV_WARNING_TIME', time() - 1);