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

Merge branch 'master' into 2.0

pull/7947/head
Jordi Boggiano 2019-01-30 08:33:13 +01:00
parent 71193132a3 e05fa2368f
commit 9c32808782
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -1,3 +1,12 @@
### [1.8.3] 2019-01-30
* Fixed regression when executing partial updates
### [1.8.2] 2019-01-29
* Fixed invalid deprecation warning for ext-pdo_mysql and similar
* Updated to latest xdebug-handler
### [1.8.1] 2019-01-29 ### [1.8.1] 2019-01-29
* Deprecated support for non-standard package names (anything with uppercase, or no / in it). Make sure to follow the warnings if you see any to avoid problems in 2.0. * Deprecated support for non-standard package names (anything with uppercase, or no / in it). Make sure to follow the warnings if you see any to avoid problems in 2.0.

10
composer.lock generated
View File

@ -187,16 +187,16 @@
}, },
{ {
"name": "composer/xdebug-handler", "name": "composer/xdebug-handler",
"version": "1.3.1", "version": "1.3.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/xdebug-handler.git", "url": "https://github.com/composer/xdebug-handler.git",
"reference": "dc523135366eb68f22268d069ea7749486458562" "reference": "d17708133b6c276d6e42ef887a877866b909d892"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/xdebug-handler/zipball/dc523135366eb68f22268d069ea7749486458562", "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/d17708133b6c276d6e42ef887a877866b909d892",
"reference": "dc523135366eb68f22268d069ea7749486458562", "reference": "d17708133b6c276d6e42ef887a877866b909d892",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -227,7 +227,7 @@
"Xdebug", "Xdebug",
"performance" "performance"
], ],
"time": "2018-11-29T10:59:02+00:00" "time": "2019-01-28T20:25:53+00:00"
}, },
{ {
"name": "justinrainbow/json-schema", "name": "justinrainbow/json-schema",

2
doc/faqs/how-to-install-composer-programmatically.md
View File

@ -35,7 +35,7 @@ give it uniqueness and authenticity as long as you can trust the GitHub servers.
For example: For example:
```bash ```bash
wget https://raw.githubusercontent.com/composer/getcomposer.org/1b137f8bf6db3e79a38a5bc45324414a6b1f9df2/web/installer -O - -q | php -- --quiet wget https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer -O - -q | php -- --quiet
``` ```
You may replace the commit hash by whatever the last commit hash is on You may replace the commit hash by whatever the last commit hash is on

1
src/Composer/Installer.php
View File

@ -1310,6 +1310,7 @@ class Installer
foreach ($this->updateWhitelist as $packageName => $void) { foreach ($this->updateWhitelist as $packageName => $void) {
$packageQueue = new \SplQueue; $packageQueue = new \SplQueue;
$nameMatchesRequiredPackage = false;
$depPackages = $repositorySet->findPackages($packageName, null, false); $depPackages = $repositorySet->findPackages($packageName, null, false);
$matchesByPattern = array(); $matchesByPattern = array();

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

@ -24,7 +24,7 @@ use Composer\XdebugHandler\XdebugHandler;
*/ */
class PlatformRepository extends ArrayRepository class PlatformRepository extends ArrayRepository
{ {
const PLATFORM_PACKAGE_REGEX = '{^(?:php(?:-64bit|-ipv6|-zts|-debug)?|hhvm|(?:ext|lib)-[a-z0-9](?:-?[a-z0-9]+)*)$}iD'; const PLATFORM_PACKAGE_REGEX = '{^(?:php(?:-64bit|-ipv6|-zts|-debug)?|hhvm|(?:ext|lib)-[a-z0-9](?:[_.-]?[a-z0-9]+)*)$}iD';
private $versionParser; private $versionParser;