From 0f68c010944c614cf92063e20ff36e0d57b2b51c Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@gmail.com>
Date: Fri, 30 Sep 2016 23:08:26 +0200
Subject: [PATCH 1/5] add php-debug virtual platform package

---
 src/Composer/Repository/PlatformRepository.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Composer/Repository/PlatformRepository.php b/src/Composer/Repository/PlatformRepository.php
index 03544554d..42b864773 100644
--- a/src/Composer/Repository/PlatformRepository.php
+++ b/src/Composer/Repository/PlatformRepository.php
@@ -81,6 +81,12 @@ class PlatformRepository extends ArrayRepository
         $php->setDescription('The PHP interpreter');
         $this->addPackage($php);
 
+        if (PHP_DEBUG) {
+            $phpdebug = new CompletePackage('php-debug', $version, $prettyVersion);
+            $phpdebug->setDescription('The PHP interpreter, with debugging symbols');
+            $this->addPackage($phpdebug);
+        }
+
         if (PHP_INT_SIZE === 8) {
             $php64 = new CompletePackage('php-64bit', $version, $prettyVersion);
             $php64->setDescription('The PHP interpreter, 64bit');

From a26c03eef04e8381c6252aa059cd38a55c915545 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@gmail.com>
Date: Fri, 30 Sep 2016 23:09:48 +0200
Subject: [PATCH 2/5] add php-zts virtual platform package

---
 src/Composer/Repository/PlatformRepository.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Composer/Repository/PlatformRepository.php b/src/Composer/Repository/PlatformRepository.php
index 42b864773..dba8343ff 100644
--- a/src/Composer/Repository/PlatformRepository.php
+++ b/src/Composer/Repository/PlatformRepository.php
@@ -87,6 +87,12 @@ class PlatformRepository extends ArrayRepository
             $this->addPackage($phpdebug);
         }
 
+        if (PHP_ZTS) {
+            $phpzts = new CompletePackage('php-zts', $version, $prettyVersion);
+            $phpzts->setDescription('The PHP interpreter, with Zend Thread Safety');
+            $this->addPackage($phpzts);
+        }
+
         if (PHP_INT_SIZE === 8) {
             $php64 = new CompletePackage('php-64bit', $version, $prettyVersion);
             $php64->setDescription('The PHP interpreter, 64bit');

From 19126d76a64c69a316ec37a38b87efab1ea6d61b Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@gmail.com>
Date: Fri, 30 Sep 2016 23:12:00 +0200
Subject: [PATCH 3/5] unify php-* package description grammar

---
 src/Composer/Repository/PlatformRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Composer/Repository/PlatformRepository.php b/src/Composer/Repository/PlatformRepository.php
index dba8343ff..a985d49bb 100644
--- a/src/Composer/Repository/PlatformRepository.php
+++ b/src/Composer/Repository/PlatformRepository.php
@@ -103,7 +103,7 @@ class PlatformRepository extends ArrayRepository
         // IPv6 support might still be available.
         if (defined('AF_INET6') || Silencer::call('inet_pton', '::') !== false) {
             $phpIpv6 = new CompletePackage('php-ipv6', $version, $prettyVersion);
-            $phpIpv6->setDescription('The PHP interpreter with IPv6 support');
+            $phpIpv6->setDescription('The PHP interpreter, with IPv6 support');
             $this->addPackage($phpIpv6);
         }
 

From 9b08ee48db9c6cddade136bb1e71317f2c73a680 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Sat, 1 Oct 2016 13:01:47 +0200
Subject: [PATCH 4/5] Update platform package regex

---
 src/Composer/Repository/PlatformRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Composer/Repository/PlatformRepository.php b/src/Composer/Repository/PlatformRepository.php
index a985d49bb..1e8249af3 100644
--- 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|-ipv6)?|hhvm|(?:ext|lib)-[^/]+)$}i';
+    const PLATFORM_PACKAGE_REGEX = '{^(?:php(?:-64bit|-ipv6|-zts|-debug)?|hhvm|(?:ext|lib)-[^/]+)$}i';
 
     /**
      * Defines overrides so that the platform can be mocked

From 1c34248022aa66c701958f8c6e7c194f28e81295 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Sat, 1 Oct 2016 13:03:15 +0200
Subject: [PATCH 5/5] Check that PHP_ZTS is defined

---
 src/Composer/Repository/PlatformRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Composer/Repository/PlatformRepository.php b/src/Composer/Repository/PlatformRepository.php
index 1e8249af3..f663b7591 100644
--- a/src/Composer/Repository/PlatformRepository.php
+++ b/src/Composer/Repository/PlatformRepository.php
@@ -87,7 +87,7 @@ class PlatformRepository extends ArrayRepository
             $this->addPackage($phpdebug);
         }
 
-        if (PHP_ZTS) {
+        if (defined('PHP_ZTS') && PHP_ZTS) {
             $phpzts = new CompletePackage('php-zts', $version, $prettyVersion);
             $phpzts->setDescription('The PHP interpreter, with Zend Thread Safety');
             $this->addPackage($phpzts);