diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-02-22 15:14:40 +0100 | 
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-02-22 15:14:40 +0100 | 
| commit | 1fbe434d453ec781648ba7344f858b4b92afee44 (patch) | |
| tree | d4f17ffe30d27f0fa07c50864eed54a9fd853654 | |
| parent | 53e05b5b417e96464f180104ea1984191f10bb34 (diff) | |
php-bartlett-PHP-CompatInfo: 2.13.0
| -rw-r--r-- | 0001-new-curl-change-in-php-5.5.patch | 75 | ||||
| -rw-r--r-- | 0002-new-filter-changes-in-php-5.5.patch | 25 | ||||
| -rw-r--r-- | 0003-new-curl-changes-in-php-5.5.patch | 82 | ||||
| -rw-r--r-- | 0004-new-intl-changes-in-php-5.5.patch | 24 | ||||
| -rw-r--r-- | 0005-fix-covers-annotation.patch | 25 | ||||
| -rw-r--r-- | 0006-fix-mysqli-reference-for-php-5.5-trans.patch | 53 | ||||
| -rw-r--r-- | php-bartlett-PHP-CompatInfo.spec | 22 | 
7 files changed, 303 insertions, 3 deletions
diff --git a/0001-new-curl-change-in-php-5.5.patch b/0001-new-curl-change-in-php-5.5.patch new file mode 100644 index 0000000..ab5bd0a --- /dev/null +++ b/0001-new-curl-change-in-php-5.5.patch @@ -0,0 +1,75 @@ +From adf248bd5595224095066fe4cacddb34f4cd6100 Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Mon, 4 Feb 2013 09:47:54 +0100 +Subject: [PATCH 1/6] new curl change in php 5.5 + +--- + PHP/CompatInfo/Reference/curl.php | 27 +++++++++++++++++++++++++++ + tests/Reference/CurlTest.php      |  1 + + 2 files changed, 28 insertions(+) + +diff --git a/PHP/CompatInfo/Reference/curl.php b/PHP/CompatInfo/Reference/curl.php +index 19bf6f8..cbfc2f0 100644 +--- a/PHP/CompatInfo/Reference/curl.php ++++ b/PHP/CompatInfo/Reference/curl.php +@@ -83,6 +83,7 @@ class PHP_CompatInfo_Reference_Curl +             'curl_error'                     => array('4.0.3', ''), +             'curl_escape'                    => array('5.5.0-dev', ''), +             'curl_exec'                      => array('4.0.2', ''), ++            'curl_file_create'               => array('5.5.0-dev', ''), +             'curl_getinfo'                   => array('4.0.4', ''), +             'curl_init'                      => array('4.0.2', ''), +             'curl_multi_add_handle'          => array('5.0.0', ''), +@@ -467,6 +468,7 @@ class PHP_CompatInfo_Reference_Curl +             'CURLOPT_RTSP_SESSION_ID'        => array('5.5.0-dev', ''), +             'CURLOPT_RTSP_STREAM_URI'        => array('5.5.0-dev', ''), +             'CURLOPT_RTSP_TRANSPORT'         => array('5.5.0-dev', ''), ++            'CURLOPT_SAFE_UPLOAD'            => array('5.5.0-dev', ''), +             'CURLOPT_SHARE'                  => array('5.5.0-dev', ''), +             'CURLOPT_SOCKS5_GSSAPI_NEC'      => array('5.5.0-dev', ''), +             'CURLOPT_SOCKS5_GSSAPI_SERVICE'  => array('5.5.0-dev', ''), +@@ -577,4 +579,29 @@ class PHP_CompatInfo_Reference_Curl +         return $constants; +     } +  ++    /** ++     * Gets informations about classes ++     * ++     * @param string $extension (optional) NULL for PHP version, ++     *                          TRUE if extension version ++     * @param string $version   (optional) php or extension version ++     * @param string $condition (optional) particular relationship with $version ++     *                          Same operator values as used by version_compare ++     * ++     * @return array ++     */ ++    public function getClasses($extension = null, $version = null, $condition = null) ++    { ++        $this->setFilter(func_get_args()); ++ ++        $classes = array(); ++ ++        $release = '5.5.0';       // soon ++        $items = array( ++            'CURLFile'                      => array('5.5.0-dev', ''), ++        ); ++        $this->applyFilter($release, $items, $classes); ++ ++        return $classes; ++    } + } +diff --git a/tests/Reference/CurlTest.php b/tests/Reference/CurlTest.php +index 473e30b..9deb8db 100644 +--- a/tests/Reference/CurlTest.php ++++ b/tests/Reference/CurlTest.php +@@ -37,6 +37,7 @@ class PHP_CompatInfo_Reference_CurlTest +      * @covers PHP_CompatInfo_Reference_Curl::getExtensions +      * @covers PHP_CompatInfo_Reference_Curl::getFunctions +      * @covers PHP_CompatInfo_Reference_Curl::getConstants ++     * @covers PHP_CompatInfo_Reference_Curl::getFunctions +      * @return void +      */ +     protected function setUp() +--  +1.7.11.7 + diff --git a/0002-new-filter-changes-in-php-5.5.patch b/0002-new-filter-changes-in-php-5.5.patch new file mode 100644 index 0000000..679daf0 --- /dev/null +++ b/0002-new-filter-changes-in-php-5.5.patch @@ -0,0 +1,25 @@ +From abea4d2fab3d8a605226775b17d9aa679266d627 Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Mon, 4 Feb 2013 09:50:23 +0100 +Subject: [PATCH 2/6] new filter changes in php 5.5 + +--- + PHP/CompatInfo/Reference/filter.php | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/PHP/CompatInfo/Reference/filter.php b/PHP/CompatInfo/Reference/filter.php +index ba66a48..0f4c713 100644 +--- a/PHP/CompatInfo/Reference/filter.php ++++ b/PHP/CompatInfo/Reference/filter.php +@@ -249,6 +249,8 @@ class PHP_CompatInfo_Reference_Filter +             'FILTER_FLAG_STRIP_BACKTICK'            => array('5.3.2', ''), +             // 2010-03-31 +             'FILTER_SANITIZE_FULL_SPECIAL_CHARS'    => array('5.3.3', ''), ++            // Soon ++            'FILTER_VALIDATE_MAC'                   => array('5.5.0-dev', ''), +         ); +         $this->applyFilter($release, $items, $constants); +  +--  +1.7.11.7 + diff --git a/0003-new-curl-changes-in-php-5.5.patch b/0003-new-curl-changes-in-php-5.5.patch new file mode 100644 index 0000000..9825dee --- /dev/null +++ b/0003-new-curl-changes-in-php-5.5.patch @@ -0,0 +1,82 @@ +From 0c164aac95d7667e9c52b968722e306f4e6c0c8e Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Mon, 4 Feb 2013 10:00:27 +0100 +Subject: [PATCH 3/6] new curl changes in php 5.5 + +--- + PHP/CompatInfo/Reference/sockets.php | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +diff --git a/PHP/CompatInfo/Reference/sockets.php b/PHP/CompatInfo/Reference/sockets.php +index 2c4c327..0abc9ed 100644 +--- a/PHP/CompatInfo/Reference/sockets.php ++++ b/PHP/CompatInfo/Reference/sockets.php +@@ -107,6 +107,14 @@ class PHP_CompatInfo_Reference_Sockets +         ); +         $this->applyFilter($release, $items, $functions); +  ++        $release = '5.5.0';       // soon ++        $items = array( ++            'socket_cmsg_space'              => array('5.5.0-dev', ''), ++            'socket_recvmsg'                 => array('5.5.0-dev', ''), ++            'socket_sendmsg'                 => array('5.5.0-dev', ''), ++        ); ++        $this->applyFilter($release, $items, $functions); ++ +         return $functions; +     } +  +@@ -135,9 +143,16 @@ class PHP_CompatInfo_Reference_Sockets +             'AF_UNIX'                        => array('4.1.0', ''), +             'IPPROTO_IP'                     => array('5.4.0', ''), +             'IPPROTO_IPV6'                   => array('5.4.0', ''), ++            'IPV6_HOPLIMIT'                  => array('5.5.0-dev', ''), +             'IPV6_MULTICAST_HOPS'            => array('5.4.0', ''), +             'IPV6_MULTICAST_IF'              => array('5.4.0', ''), +             'IPV6_MULTICAST_LOOP'            => array('5.4.0', ''), ++            'IPV6_PKTINFO'                   => array('5.5.0-dev', ''), ++            'IPV6_RECVTCLASS'                => array('5.5.0-dev', ''), ++            'IPV6_RECVHOPLIMIT'              => array('5.5.0-dev', ''), ++            'IPV6_RECVPKTINFO'               => array('5.5.0-dev', ''), ++            'IPV6_TCLASS'                    => array('5.5.0-dev', ''), ++            'IPV6_UNICAST_HOPS'              => array('5.5.0-dev', ''), +             'IP_MULTICAST_IF'                => array('5.4.0', ''), +             'IP_MULTICAST_LOOP'              => array('5.4.0', ''), +             'IP_MULTICAST_TTL'               => array('5.4.0', ''), +@@ -147,15 +162,25 @@ class PHP_CompatInfo_Reference_Sockets +             'MCAST_LEAVE_GROUP'              => array('5.4.0', ''), +             'MCAST_LEAVE_SOURCE_GROUP'       => array('5.4.0', ''), +             'MCAST_UNBLOCK_SOURCE'           => array('5.4.0', ''), ++            'MSG_CMSG_CLOEXEC'               => array('5.5.0-dev', ''), ++            'MSG_CTRUNC'                     => array('5.5.0-dev', ''), ++            'MSG_CONFIRM'                    => array('5.5.0-dev', ''), +             'MSG_DONTROUTE'                  => array('4.1.0', ''), +             'MSG_DONTWAIT'                   => array('5.2.10', ''), +             'MSG_EOF'                        => array('5.2.4', ''), ++            'MSG_ERRQUEUE'                   => array('5.5.0-dev', ''), +             'MSG_EOR'                        => array('5.2.4', ''), ++            'MSG_MORE'                       => array('5.5.0-dev', ''), ++            'MSG_NOSIGNAL'                   => array('5.5.0-dev', ''), +             'MSG_OOB'                        => array('4.1.0', ''), +             'MSG_PEEK'                       => array('4.1.0', ''), ++            'MSG_TRUNC'                      => array('5.5.0-dev', ''), ++            'MSG_WAITFORONE'                 => array('5.5.0-dev', ''), +             'MSG_WAITALL'                    => array('4.1.0', ''), +             'PHP_BINARY_READ'                => array('4.1.0', ''), +             'PHP_NORMAL_READ'                => array('4.1.0', ''), ++            'SCM_CREDENTIALS'                => array('5.5.0-dev', ''), ++            'SCM_RIGHTS'                     => array('5.5.0-dev', ''), +             'SOCKET_E2BIG'                   => array('4.3.0', ''), +             'SOCKET_EACCES'                  => array('4.1.0', ''), +             'SOCKET_EADDRINUSE'              => array('4.1.0', ''), +@@ -284,6 +309,7 @@ class PHP_CompatInfo_Reference_Sockets +             'SO_KEEPALIVE'                   => array('4.1.0', ''), +             'SO_LINGER'                      => array('4.1.0', ''), +             'SO_OOBINLINE'                   => array('4.1.0', ''), ++            'SO_PASSCRED'                    => array('5.5.0-dev', ''), +             'SO_RCVBUF'                      => array('4.1.0', ''), +             'SO_RCVLOWAT'                    => array('4.1.0', ''), +             'SO_RCVTIMEO'                    => array('4.1.0', ''), +--  +1.7.11.7 + diff --git a/0004-new-intl-changes-in-php-5.5.patch b/0004-new-intl-changes-in-php-5.5.patch new file mode 100644 index 0000000..b8d2f60 --- /dev/null +++ b/0004-new-intl-changes-in-php-5.5.patch @@ -0,0 +1,24 @@ +From 1a72a586223d64fbaa6254dbb26186e852b1a214 Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Mon, 4 Feb 2013 10:01:51 +0100 +Subject: [PATCH 4/6] new intl changes in php 5.5 + +--- + PHP/CompatInfo/Reference/intl.php | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/PHP/CompatInfo/Reference/intl.php b/PHP/CompatInfo/Reference/intl.php +index 86c6d3d..adaa96d 100644 +--- a/PHP/CompatInfo/Reference/intl.php ++++ b/PHP/CompatInfo/Reference/intl.php +@@ -132,6 +132,7 @@ class PHP_CompatInfo_Reference_Intl +             'IntlPartsIterator'             => array('5.5.0-dev', ''), +             'IntlRuleBasedBreakIterator'    => array('5.5.0-dev', ''), +             'IntlTimeZone'                  => array('5.5.0-dev', ''), ++            'UConverter'                    => array('5.5.0-dev', ''), +         ); +         $this->applyFilter($release, $items, $classes); +  +--  +1.7.11.7 + diff --git a/0005-fix-covers-annotation.patch b/0005-fix-covers-annotation.patch new file mode 100644 index 0000000..463147f --- /dev/null +++ b/0005-fix-covers-annotation.patch @@ -0,0 +1,25 @@ +From fa13cf28168ca1b8c1cdc4cf01641479d17e5462 Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Mon, 4 Feb 2013 11:14:52 +0100 +Subject: [PATCH 5/6] fix @covers annotation + +--- + tests/Reference/CurlTest.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/Reference/CurlTest.php b/tests/Reference/CurlTest.php +index 9deb8db..667e562 100644 +--- a/tests/Reference/CurlTest.php ++++ b/tests/Reference/CurlTest.php +@@ -37,7 +37,7 @@ class PHP_CompatInfo_Reference_CurlTest +      * @covers PHP_CompatInfo_Reference_Curl::getExtensions +      * @covers PHP_CompatInfo_Reference_Curl::getFunctions +      * @covers PHP_CompatInfo_Reference_Curl::getConstants +-     * @covers PHP_CompatInfo_Reference_Curl::getFunctions ++     * @covers PHP_CompatInfo_Reference_Curl::getClasses +      * @return void +      */ +     protected function setUp() +--  +1.7.11.7 + diff --git a/0006-fix-mysqli-reference-for-php-5.5-trans.patch b/0006-fix-mysqli-reference-for-php-5.5-trans.patch new file mode 100644 index 0000000..b55c381 --- /dev/null +++ b/0006-fix-mysqli-reference-for-php-5.5-trans.patch @@ -0,0 +1,53 @@ +From 4b7619c705882351d12ada35be473779287a1c6e Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Wed, 13 Feb 2013 11:22:28 +0100 +Subject: [PATCH 6/6] fix mysqli reference for php 5.5 (trans) + +--- + PHP/CompatInfo/Reference/mysqli.php | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/PHP/CompatInfo/Reference/mysqli.php b/PHP/CompatInfo/Reference/mysqli.php +index e635150..d2215e0 100644 +--- a/PHP/CompatInfo/Reference/mysqli.php ++++ b/PHP/CompatInfo/Reference/mysqli.php +@@ -113,6 +113,7 @@ class PHP_CompatInfo_Reference_Mysqli +         $items = array( +             'mysqli_affected_rows'           => array('5.0.0', ''), +             'mysqli_autocommit'              => array('5.0.0', ''), ++            'mysqli_begin_transaction'       => array('5.5.0-dev', ''), +             'mysqli_bind_param'              => array('5.0.0', self::LATEST_PHP_5_3), +             'mysqli_bind_result'             => array('5.0.0', self::LATEST_PHP_5_3), +             'mysqli_change_user'             => array('5.0.0', ''), +@@ -185,11 +186,13 @@ class PHP_CompatInfo_Reference_Mysqli +             'mysqli_real_query'              => array('5.0.0', ''), +             'mysqli_reap_async_query'        => array('5.0.0', ''), +             'mysqli_refresh'                 => array('5.3.0', ''), ++            'mysqli_release_savepoint'       => array('5.5.0-dev', ''), +             'mysqli_report'                  => array('5.0.0', ''), +             'mysqli_rollback'                => array('5.0.0', ''), +             'mysqli_rpl_parse_enabled'       => array('5.0.0', self::LATEST_PHP_5_2), +             'mysqli_rpl_probe'               => array('5.0.0', self::LATEST_PHP_5_2), +             'mysqli_rpl_query_type'          => array('5.0.0', self::LATEST_PHP_5_2), ++            'mysqli_savepoint'               => array('5.5.0-dev', ''), +             'mysqli_select_db'               => array('5.0.0', ''), +             'mysqli_send_long_data'          => array('5.0.0', self::LATEST_PHP_5_3), +             'mysqli_send_query'              => array('5.0.0', self::LATEST_PHP_5_2), +@@ -336,6 +339,14 @@ class PHP_CompatInfo_Reference_Mysqli +                                              => array('5.0.0', ''), +             'MYSQLI_STORE_RESULT'            => array('5.0.0', ''), +             'MYSQLI_TIMESTAMP_FLAG'          => array('5.0.0', ''), ++            'MYSQLI_TRANS_COR_AND_CHAIN'     => array('5.5.0-dev', ''), ++            'MYSQLI_TRANS_COR_AND_NO_CHAIN'  => array('5.5.0-dev', ''), ++            'MYSQLI_TRANS_COR_NO_RELEASE'    => array('5.5.0-dev', ''), ++            'MYSQLI_TRANS_COR_RELEASE'       => array('5.5.0-dev', ''), ++            'MYSQLI_TRANS_START_READ_ONLY'   => array('5.5.0-dev', ''), ++            'MYSQLI_TRANS_START_READ_WRITE'  => array('5.5.0-dev', ''), ++            'MYSQLI_TRANS_START_WITH_CONSISTENT_SNAPSHOT' ++                                             => array('5.5.0-dev', ''), +             'MYSQLI_TYPE_BIT'                => array('5.0.0', ''), +             'MYSQLI_TYPE_BLOB'               => array('5.0.0', ''), +             'MYSQLI_TYPE_CHAR'               => array('5.0.0', ''), +--  +1.7.11.7 + diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 067f260..926c468 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -8,7 +8,7 @@  Name:           php-bartlett-PHP-CompatInfo -Version:        2.12.1 +Version:        2.13.0  Release:        1%{?dist}  Summary:        Find out version and the extensions required for a piece of code to run @@ -37,6 +37,12 @@ Patch14:        0014-curl-reference-for-php-5.5-more.patch  Patch15:        0015-mysqli-new-constant.patch  Patch16:        0016-MYSQLI_OPT_CAN_HANDLE_EXPIRED_PASSWORDS-is-5.4.12.patch  Patch17:        0017-data-reference-for-php-5.5-date-immutable.patch +Patch18:        0001-new-curl-change-in-php-5.5.patch +Patch19:        0002-new-filter-changes-in-php-5.5.patch +Patch20:        0003-new-curl-changes-in-php-5.5.patch +Patch21:        0004-new-intl-changes-in-php-5.5.patch +Patch22:        0005-fix-covers-annotation.patch +Patch23:        0006-fix-mysqli-reference-for-php-5.5-trans.patch  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  BuildArch:      noarch @@ -44,7 +50,7 @@ BuildRequires:  php-pear(PEAR) >= 1.9.0  BuildRequires:  php-channel(%{channel})  # to run test suite  BuildRequires:  php-pear(pear.phpunit.de/PHPUnit) >= 3.6.0 -BuildRequires:  php-pear(%{channel}/PHP_Reflect) >= 1.5.0 +BuildRequires:  php-pear(%{channel}/PHP_Reflect) >= 1.6.0  Requires(post): %{__pear}  Requires(postun): %{__pear} @@ -56,7 +62,7 @@ Requires:       php-pcre  Requires:       php-reflection  Requires:       php-spl  Requires:       php-pear(PEAR) >= 1.9.0 -Requires:       php-pear(%{channel}/PHP_Reflect) >= 1.5.0 +Requires:       php-pear(%{channel}/PHP_Reflect) >= 1.6.0  Requires:       php-pear(Console_CommandLine) >= 1.2.0  # Optional  Requires:       php-pear(pear.phpunit.de/PHPUnit) >= 3.6.0 @@ -100,6 +106,12 @@ cd %{pear_name}-%{version}%{?prever}  %patch15 -p1  %patch16 -p1  %patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1  # remove checksum for patched files  sed -e 's/md5sum.*name/name/' \ @@ -183,6 +195,10 @@ fi  %changelog +* Fri Feb 22 2013 Remi Collet <remi@fedoraproject.org> - 2.13.0-1 +- Update to 2.13.0 +- raise dependencies, PHP_Reflect 1.6.0 +  * Fri Jan 18 2013 Remi Collet <remi@fedoraproject.org> - 2.12.1-1  - update to Version 2.12.1  - fix path to documentation in description  | 
