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

Merge branch 'master' into 2.0

pull/8669/head
Jordi Boggiano 2020-02-14 17:03:29 +01:00
parent 0ad322e51f 4f59162827
commit 2e82e34fe0
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
composer.lock generated
View File

@ -451,16 +451,16 @@
}, },
{ {
"name": "seld/phar-utils", "name": "seld/phar-utils",
"version": "1.0.2", "version": "1.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Seldaek/phar-utils.git", "url": "https://github.com/Seldaek/phar-utils.git",
"reference": "84715761c35808076b00908a20317a3a8a67d17e" "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/84715761c35808076b00908a20317a3a8a67d17e", "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8800503d56b9867d43d9c303b9cbcc26016e82f0",
"reference": "84715761c35808076b00908a20317a3a8a67d17e", "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -489,9 +489,9 @@
], ],
"description": "PHAR file format utilities, for when PHP phars you up", "description": "PHAR file format utilities, for when PHP phars you up",
"keywords": [ "keywords": [
"phra" "phar"
], ],
"time": "2020-01-13T10:41:09+00:00" "time": "2020-02-14T15:25:33+00:00"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
@ -935,10 +935,6 @@
"constructor", "constructor",
"instantiate" "instantiate"
], ],
"support": {
"issues": "https://github.com/doctrine/instantiator/issues",
"source": "https://github.com/doctrine/instantiator/tree/master"
},
"time": "2015-06-14T21:17:01+00:00" "time": "2015-06-14T21:17:01+00:00"
}, },
{ {
@ -982,6 +978,12 @@
"license": [ "license": [
"MIT" "MIT"
], ],
"authors": [
{
"name": "Mike van Riel",
"email": "mike.vanriel@naenius.com"
}
],
"time": "2016-01-25T08:17:30+00:00" "time": "2016-01-25T08:17:30+00:00"
}, },
{ {

3
src/Composer/Compiler.php
View File

@ -18,6 +18,7 @@ use Composer\CaBundle\CaBundle;
use Symfony\Component\Finder\Finder; use Symfony\Component\Finder\Finder;
use Symfony\Component\Process\Process; use Symfony\Component\Process\Process;
use Seld\PharUtils\Timestamps; use Seld\PharUtils\Timestamps;
use Seld\PharUtils\Linter;
/** /**
* The Compiler class compiles composer into a phar * The Compiler class compiles composer into a phar
@ -163,6 +164,8 @@ class Compiler
$util = new Timestamps($pharFile); $util = new Timestamps($pharFile);
$util->updateTimestamps($this->versionDate); $util->updateTimestamps($this->versionDate);
$util->save($pharFile, \Phar::SHA1); $util->save($pharFile, \Phar::SHA1);
Linter::lint($pharFile);
} }
/** /**

2
src/Composer/Repository/Vcs/GitHubDriver.php
View File

@ -204,7 +204,7 @@ class GitHubDriver extends VcsDriver
), ),
'retry-auth-failure' => false, 'retry-auth-failure' => false,
)); ));
} catch (\TransportException $e) { } catch (TransportException $e) {
return $this->fundingInfo = false; return $this->fundingInfo = false;
} }
$result = json_decode($result, true); $result = json_decode($result, true);