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-28 14:54:09 +01:00
parent 9cab8c10cc 05737a46fb
commit 80875e896d
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,6 +205,7 @@ class GitHubDriver extends VcsDriver
if (empty($response['content']) || $response['encoding'] !== 'base64' || !($funding = base64_decode($response['content']))) { if (empty($response['content']) || $response['encoding'] !== 'base64' || !($funding = base64_decode($response['content']))) {
continue; continue;
} }
break;
} }
if (empty($funding)) { if (empty($funding)) {
return $this->fundingInfo = false; return $this->fundingInfo = false;
@ -218,16 +219,16 @@ class GitHubDriver extends VcsDriver
if (preg_match('{^(\w+)\s*:\s*(.+)$}', $line, $match)) { if (preg_match('{^(\w+)\s*:\s*(.+)$}', $line, $match)) {
if (preg_match('{^\[.*\]$}', $match[2])) { if (preg_match('{^\[.*\]$}', $match[2])) {
foreach (array_map('trim', preg_split('{[\'"]?\s*,\s*[\'"]?}', substr($match[2], 1, -1))) as $item) { foreach (array_map('trim', preg_split('{[\'"]?\s*,\s*[\'"]?}', substr($match[2], 1, -1))) as $item) {
$result[] = array('type' => $match[1], 'url' => trim($item, '"\'')); $result[] = array('type' => $match[1], 'url' => trim($item, '"\' '));
} }
} else { } else {
$result[] = array('type' => $match[1], 'url' => $match[2]); $result[] = array('type' => $match[1], 'url' => trim($match[2], '"\' '));
} }
$key = null; $key = null;
} elseif (preg_match('{^(\w+)\s*:$}', $line, $match)) { } elseif (preg_match('{^(\w+)\s*:$}', $line, $match)) {
$key = $match[1]; $key = $match[1];
} elseif ($key && preg_match('{^-\s*(.+)$}', $line, $match)) { } elseif ($key && preg_match('{^-\s*(.+)$}', $line, $match)) {
$result[] = array('type' => $key, 'url' => $match[1]); $result[] = array('type' => $key, 'url' => trim($match[1], '"\' '));
} }
} }