Merge branch '1.2'

2016-09-12 22:50:58 +02:00 · 2016-09-12 22:50:58 +02:00 · 429ee5f8eb
parent 2e8ddfb86f a2b3e89d56
commit 429ee5f8eb
1 changed files with 1 additions and 1 deletions
--- a/src/Composer/Repository/PlatformRepository.php
+++ b/src/Composer/Repository/PlatformRepository.php
@ -23,7 +23,7 @@ use Composer\Util\Silencer;
 */
 class PlatformRepository extends ArrayRepository
 {
-    const PLATFORM_PACKAGE_REGEX = '{^(?:php(?:-64bit)?|hhvm|(?:ext|lib)-[^/]+)$}i';
+    const PLATFORM_PACKAGE_REGEX = '{^(?:php(?:-64bit|-ipv6)?|hhvm|(?:ext|lib)-[^/]+)$}i';

    /**
     * Defines overrides so that the platform can be mocked