dev-php/PEAR-HTTP_Client: Add patch for modern PHP versions

Package-Manager: Portage-2.3.6, Repoman-2.3.3

diff --git a/dev-php/PEAR-HTTP_Client/PEAR-HTTP_Client-1.2.1-r1.ebuild b/dev-php/PEAR-HTTP_Client/PEAR-HTTP_Client-1.2.1-r1.ebuild
index 546412ed2b76d8b1eb4028ea614b263a6e2d7fdb..be135e1f8c4796bf31185bbef9cbba8916d5b084 100644 (file)
--- a/dev-php/PEAR-HTTP_Client/PEAR-HTTP_Client-1.2.1-r1.ebuild
+++ b/dev-php/PEAR-HTTP_Client/PEAR-HTTP_Client-1.2.1-r1.ebuild
@@ -12,6 +12,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 RDEPEND=">=dev-php/PEAR-HTTP_Request-1.2"
 
+PATCHES=( "${FILESDIR}/modern-php.patch" )
+
 src_install() {
        insinto /usr/share/php/HTTP
        doins -r Client.php Client

diff --git a/dev-php/PEAR-HTTP_Client/files/modern-php.patch b/dev-php/PEAR-HTTP_Client/files/modern-php.patch
new file mode 100644 (file)
index 0000000..6e71545
--- /dev/null
+++ b/dev-php/PEAR-HTTP_Client/files/modern-php.patch
@@ -0,0 +1,69 @@
+diff -aurN a/Client/CookieManager.php b/Client/CookieManager.php
+--- a/Client/CookieManager.php 2008-10-25 13:08:26.000000000 -0400
++++ b/Client/CookieManager.php 2017-08-07 10:17:04.495233973 -0400
+@@ -75,11 +75,14 @@
+     * @access   public\r
+     * @see      serializeSessionCookies()\r
+     */\r
+-    function HTTP_Client_CookieManager($serializeSession = false)\r
++    function __construct($serializeSession = false)\r
+     {\r
+         $this->serializeSessionCookies($serializeSession);\r
+     }\r
+-\r
++    function HTTP_Client_CookieManager($serializeSession = false)\r
++    {\r
++        self::__construct($serializeSession);\r
++    }\r
+    /**\r
+     * Sets whether session cookies should be serialized when serializing object\r
+     *\r
+@@ -264,4 +267,3 @@
+         }\r
+     }\r
+ }\r
+-?>\r
+diff -aurN a/Client.php b/Client.php
+--- a/Client.php       2008-10-25 13:08:26.000000000 -0400
++++ b/Client.php       2017-08-07 10:13:52.524610550 -0400
+@@ -171,12 +171,12 @@
+     * @param    array                       Default headers to send on every request\r
+     * @param    HTTP_Client_CookieManager   Cookie manager object to use\r
+     */\r
+-    function HTTP_Client($defaultRequestParams = null, $defaultHeaders = null, $cookieManager = null)\r
++    function __construct($defaultRequestParams = null, $defaultHeaders = null, $cookieManager = null)\r
+     {\r
+         if (!empty($cookieManager) && is_a($cookieManager, 'HTTP_Client_CookieManager')) {\r
+             $this->_cookieManager = $cookieManager;\r
+         } else {\r
+-            $this->_cookieManager =& new HTTP_Client_CookieManager();\r
++            $this->_cookieManager = new HTTP_Client_CookieManager();\r
+         }\r
+         if (isset($defaultHeaders)) {\r
+             $this->setDefaultHeader($defaultHeaders);\r
+@@ -185,7 +185,10 @@
+             $this->setRequestParameter($defaultRequestParams);\r
+         }\r
+     }\r
+-\r
++    function HTTP_Client($defaultRequestParams = null, $defaultHeaders = null, $cookieManager = null)\r
++    {\r
++        self::__construct($defaultRequestParams, $defaultHeaders, $cookieManager);\r
++    }\r
+ \r
+    /**\r
+     * Sets the maximum redirects that will be processed.\r
+@@ -225,7 +228,7 @@
+     */\r
+     function &_createRequest($url, $method = HTTP_REQUEST_METHOD_GET, $headers = array())\r
+     {\r
+-        $req =& new HTTP_Request($url, $this->_defaultRequestParams);\r
++        $req = new HTTP_Request($url, $this->_defaultRequestParams);\r
+         $req->setMethod($method);\r
+         foreach ($this->_defaultHeaders as $name => $value) {\r
+             $req->addHeader($name, $value);\r
+@@ -716,4 +719,3 @@
+         return $this->_idx < count($this->_responses);\r
+     }\r
+ }\r
+-?>\r