diff options
| -rw-r--r-- | 1b1435c135c69d81b47f1f0662633867c5c289b5.patch | 209 | ||||
| -rw-r--r-- | REFLECTION | 6 | ||||
| -rw-r--r-- | php-pecl-http.spec | 23 |
3 files changed, 15 insertions, 223 deletions
diff --git a/1b1435c135c69d81b47f1f0662633867c5c289b5.patch b/1b1435c135c69d81b47f1f0662633867c5c289b5.patch deleted file mode 100644 index c0f1741..0000000 --- a/1b1435c135c69d81b47f1f0662633867c5c289b5.patch +++ /dev/null @@ -1,209 +0,0 @@ -From 1b1435c135c69d81b47f1f0662633867c5c289b5 Mon Sep 17 00:00:00 2001 -From: Michael Wallner <mike@php.net> -Date: Tue, 24 Jan 2017 08:38:58 +0100 -Subject: [PATCH] fix querystring object conversion on master - ---- - tests/querystring001.phpt | 1 + - tests/querystring001_a.phpt | 180 ++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 181 insertions(+) - create mode 100644 tests/querystring001_a.phpt - -diff --git a/tests/querystring001.phpt b/tests/querystring001.phpt -index 203be33..e2e563d 100644 ---- a/tests/querystring001.phpt -+++ b/tests/querystring001.phpt -@@ -3,6 +3,7 @@ query string - --SKIPIF-- - <?php - include("skipif.inc"); -+version_compare(PHP_VERSION, "7.2.0-dev", "<") or die("skip only for PHP < 7.2.0"); - ?> - --GET-- - str=abc&num=-123&dec=123.123&bool=1&arr[]=1&arr[]=2&ma[l1][l2]=2&ma[l2][l3][l4]=3 -diff --git a/tests/querystring001_a.phpt b/tests/querystring001_a.phpt -new file mode 100644 -index 0000000..24994f2 ---- /dev/null -+++ b/tests/querystring001_a.phpt -@@ -0,0 +1,180 @@ -+--TEST-- -+query string -+--SKIPIF-- -+<?php -+include("skipif.inc"); -+version_compare(PHP_VERSION, "7.2.0-dev", ">=") or die("skip only for PHP >= 7.2.0"); -+?> -+--GET-- -+str=abc&num=-123&dec=123.123&bool=1&arr[]=1&arr[]=2&ma[l1][l2]=2&ma[l2][l3][l4]=3 -+--FILE-- -+<?php -+echo "Test\n"; -+ -+printf("\nGlobal instance:\n"); -+$q = http\QueryString::getGlobalInstance(); -+printf("%s\n", $q); -+ -+printf("\nStandard getters:\n"); -+var_dump($q->getString("str")); -+var_dump($q->getInt("num")); -+var_dump($q->getFloat("dec")); -+var_dump($q->getInt("dec")); -+var_dump($q->getFloat("dec")); -+var_dump($q->getBool("bool")); -+var_dump($q->getInt("bool")); -+var_dump($q->getBool("num")); -+var_dump($q->getInt("num")); -+var_dump($q->getArray("arr")); -+var_dump($q->getArray("ma")); -+var_dump($q->getObject("arr")); -+var_dump($q->getObject("ma")); -+ -+$s = $q->toString(); -+ -+printf("\nClone modifications do not alter global instance:\n"); -+$q->mod(array("arr" => array(3 => 3))); -+printf("%s\n", $q); -+ -+printf("\nClone modifications do not alter standard instance:\n"); -+$q2 = new http\QueryString($s); -+$q3 = $q2->mod(array("arr" => array(3 => 3))); -+printf("%s\n%s\n", $q2, $q3); -+#var_dump($q2, $q3); -+ -+printf("\nIterator:\n"); -+$it = new RecursiveIteratorIterator($q2, RecursiveIteratorIterator::SELF_FIRST); -+foreach ($it as $k => $v) { -+ $i = $it->getDepth()*8; -+ @printf("%{$i}s: %s\n", $k, $v); -+} -+ -+printf("\nReplace a multi dimensional key:\n"); -+printf("%s\n", $q2->mod(array("ma" => null))->set(array("ma" => array("l1" => false)))); -+ -+printf("\nXlate:\n"); -+$qu = new http\QueryString("ü=ö"); -+printf("utf8: %s\n", $qu); -+printf("latin1: %s\n", method_exists($qu, "xlate") ? $qu->xlate("utf-8", "latin1") : "%FC=%F6"); -+ -+printf("\nOffsets:\n"); -+var_dump($q2["ma"]); -+$q2["ma"] = array("bye"); -+var_dump($q2["ma"]); -+var_dump(isset($q2["ma"])); -+unset($q2["ma"]); -+var_dump(isset($q2["ma"])); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+Test -+ -+Global instance: -+str=abc&num=-123&dec=123.123&bool=1&arr%5B0%5D=1&arr%5B1%5D=2&ma%5Bl1%5D%5Bl2%5D=2&ma%5Bl2%5D%5Bl3%5D%5Bl4%5D=3 -+ -+Standard getters: -+string(3) "abc" -+int(-123) -+float(123.123) -+int(123) -+float(123.123) -+bool(true) -+int(1) -+bool(true) -+int(-123) -+array(2) { -+ [0]=> -+ string(1) "1" -+ [1]=> -+ string(1) "2" -+} -+array(2) { -+ ["l1"]=> -+ array(1) { -+ ["l2"]=> -+ string(1) "2" -+ } -+ ["l2"]=> -+ array(1) { -+ ["l3"]=> -+ array(1) { -+ ["l4"]=> -+ string(1) "3" -+ } -+ } -+} -+object(stdClass)#%d (2) { -+ ["0"]=> -+ string(1) "1" -+ ["1"]=> -+ string(1) "2" -+} -+object(stdClass)#%d (2) { -+ ["l1"]=> -+ array(1) { -+ ["l2"]=> -+ string(1) "2" -+ } -+ ["l2"]=> -+ array(1) { -+ ["l3"]=> -+ array(1) { -+ ["l4"]=> -+ string(1) "3" -+ } -+ } -+} -+ -+Clone modifications do not alter global instance: -+str=abc&num=-123&dec=123.123&bool=1&arr%5B0%5D=1&arr%5B1%5D=2&ma%5Bl1%5D%5Bl2%5D=2&ma%5Bl2%5D%5Bl3%5D%5Bl4%5D=3 -+ -+Clone modifications do not alter standard instance: -+str=abc&num=-123&dec=123.123&bool=1&arr%5B0%5D=1&arr%5B1%5D=2&ma%5Bl1%5D%5Bl2%5D=2&ma%5Bl2%5D%5Bl3%5D%5Bl4%5D=3 -+str=abc&num=-123&dec=123.123&bool=1&arr%5B0%5D=1&arr%5B1%5D=2&arr%5B3%5D=3&ma%5Bl1%5D%5Bl2%5D=2&ma%5Bl2%5D%5Bl3%5D%5Bl4%5D=3 -+ -+Iterator: -+str: abc -+num: -123 -+dec: 123.123 -+bool: 1 -+arr: Array -+ 0: 1 -+ 1: 2 -+ma: Array -+ l1: Array -+ l2: 2 -+ l2: Array -+ l3: Array -+ l4: 3 -+ -+Replace a multi dimensional key: -+str=abc&num=-123&dec=123.123&bool=1&arr%5B0%5D=1&arr%5B1%5D=2&ma%5Bl1%5D= -+ -+Xlate: -+utf8: %C3%BC=%C3%B6 -+latin1: %FC=%F6 -+ -+Offsets: -+array(2) { -+ ["l1"]=> -+ array(1) { -+ ["l2"]=> -+ string(1) "2" -+ } -+ ["l2"]=> -+ array(1) { -+ ["l3"]=> -+ array(1) { -+ ["l4"]=> -+ string(1) "3" -+ } -+ } -+} -+array(1) { -+ [0]=> -+ string(3) "bye" -+} -+bool(true) -+bool(false) -+Done @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #168 http version 3.1.0 ] { +Extension [ <persistent> extension #169 http version 3.1.1RC1 ] { - Dependencies { Dependency [ raphf (Required) ] @@ -33,9 +33,9 @@ Extension [ <persistent> extension #168 http version 3.1.0 ] { Constant [ integer http\Client\Curl\Features\HTTP2 ] { 65536 } Constant [ integer http\Client\Curl\Features\UNIX_SOCKETS ] { 524288 } Constant [ integer http\Client\Curl\Features\PSL ] { 1048576 } - Constant [ string http\Client\Curl\VERSIONS ] { libcurl/7.51.0 NSS/3.29.3 zlib/1.2.8 libidn2/2.0.2 libpsl/0.17.0 (+libidn2/0.11) libssh2/1.8.0 nghttp2/1.13.0 } + Constant [ string http\Client\Curl\VERSIONS ] { libcurl/7.51.0 NSS/3.30.2 zlib/1.2.8 libidn2/2.0.2 libpsl/0.17.0 (+libidn2/0.11) libssh2/1.8.0 nghttp2/1.13.0 } Constant [ string http\Client\Curl\Versions\CURL ] { 7.51.0 } - Constant [ string http\Client\Curl\Versions\SSL ] { NSS/3.29.3 } + Constant [ string http\Client\Curl\Versions\SSL ] { NSS/3.30.2 } Constant [ string http\Client\Curl\Versions\LIBZ ] { 1.2.8 } Constant [ integer http\Client\Curl\HTTP_VERSION_1_0 ] { 1 } Constant [ integer http\Client\Curl\HTTP_VERSION_1_1 ] { 2 } diff --git a/php-pecl-http.spec b/php-pecl-http.spec index 3fcacab..28ae37e 100644 --- a/php-pecl-http.spec +++ b/php-pecl-http.spec @@ -22,7 +22,6 @@ %global gh_owner m6w6 %global gh_project ext-http #global gh_date 20150928 -#global prever RC1 # The project is pecl_http but the extension is only http %global proj_name pecl_http %global pecl_name http @@ -36,15 +35,17 @@ %global with_tests 0%{!?_without_tests:1} %endif -#global prever RC1 +%global upstream_version 3.1.1 +%global upstream_prever RC1 + Name: %{?sub_prefix}php-pecl-http -Version: 3.1.0 +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} %if 0%{?gh_date:1} Release: 0.2.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz %else -Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -Source0: http://pecl.php.net/get/%{proj_name}-%{version}%{?prever}.tgz +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Source0: http://pecl.php.net/get/%{proj_name}-%{upstream_version}%{?upstream_prever}.tgz %endif Summary: Extended HTTP support @@ -55,8 +56,6 @@ URL: http://pecl.php.net/package/pecl_http # From http://www.php.net/manual/en/http.configuration.php Source1: %{proj_name}.ini -Patch0: 1b1435c135c69d81b47f1f0662633867c5c289b5.patch - BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-hash BuildRequires: %{?scl_prefix}php-spl @@ -159,17 +158,16 @@ These are the files needed to compile programs using HTTP extension. mv %{gh_project}-%{gh_commit} NTS mv NTS/package.xml . %else -mv %{proj_name}-%{version}%{?prever} NTS +mv %{proj_name}-%{upstream_version}%{?upstream_prever} NTS %endif %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS -%patch0 -p1 -b .upstream extver=$(sed -n '/#define PHP_PECL_HTTP_VERSION/{s/.* "//;s/".*$//;p}' php_http.h) -if test "x${extver}" != "x%{version}%{?prever}%{?gh_date:dev}"; then - : Error: Upstream HTTP version is now ${extver}, expecting %{version}%{?prever}%{?gh_date:dev}. +if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}%{?gh_date:dev}"; then + : Error: Upstream HTTP version is now ${extver}, expecting %{upstream_version}%{?upstream_prever}%{?gh_date:dev}. : Update the pdover macro and rebuild. exit 1 fi @@ -341,6 +339,9 @@ fi %changelog +* Mon Jul 3 2017 Remi Collet <remi@remirepo.net> - 3.1.1~RC1-1 +- update to 3.1.1RC1 + * Fri Jun 23 2017 Remi Collet <remi@remirepo.net> - 3.1.0-5 - add upstream patch for 7.2 |