diff options
29 files changed, 71 insertions, 1763 deletions
diff --git a/0001-cuirl-reference-for-php-5.5.patch b/0001-cuirl-reference-for-php-5.5.patch deleted file mode 100644 index fc4f65b..0000000 --- a/0001-cuirl-reference-for-php-5.5.patch +++ /dev/null @@ -1,391 +0,0 @@ -From abbcc1b67842a7c55f2679e2fdc5b05592f5ed91 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Sat, 1 Dec 2012 18:21:33 +0100 -Subject: [PATCH 01/17] cuirl reference for php 5.5 - ---- - PHP/CompatInfo/Reference/curl.php | 131 ++++++++++++++++++++++++++++++++++++++ - 1 file changed, 131 insertions(+) - -diff --git a/PHP/CompatInfo/Reference/curl.php b/PHP/CompatInfo/Reference/curl.php -index cf2760a..c12dc0f 100644 ---- a/PHP/CompatInfo/Reference/curl.php -+++ b/PHP/CompatInfo/Reference/curl.php -@@ -81,6 +81,7 @@ class PHP_CompatInfo_Reference_Curl - 'curl_copy_handle' => array('5.0.0', ''), - 'curl_errno' => array('4.0.3', ''), - 'curl_error' => array('4.0.3', ''), -+ 'curl_escape' => array('5.5.0-dev', ''), - 'curl_exec' => array('4.0.2', ''), - 'curl_getinfo' => array('4.0.4', ''), - 'curl_init' => array('4.0.2', ''), -@@ -92,8 +93,13 @@ class PHP_CompatInfo_Reference_Curl - 'curl_multi_init' => array('5.0.0', ''), - 'curl_multi_remove_handle' => array('5.0.0', ''), - 'curl_multi_select' => array('5.0.0', ''), -+ 'curl_reset' => array('5.5.0-dev', ''), - 'curl_setopt' => array('4.0.2', ''), - 'curl_setopt_array' => array('5.1.3', ''), -+ 'curl_share_close' => array('5.5.0-dev', ''), -+ 'curl_share_init' => array('5.5.0-dev', ''), -+ 'curl_share_setopt' => array('5.5.0-dev', ''), -+ 'curl_unescape' => array('5.5.0-dev', ''), - 'curl_version' => array('4.0.2', ''), - ); - $this->applyFilter($release, $items, $functions); -@@ -121,18 +127,41 @@ class PHP_CompatInfo_Reference_Curl - - $release = false; - $items = array( -+ 'CURL_FNMATCHFUNC_FAIL' => array('5.5.0-dev', ''), -+ 'CURL_FNMATCHFUNC_MATCH' => array('5.5.0-dev', ''), -+ 'CURL_FNMATCHFUNC_NOMATCH' => array('5.5.0-dev', ''), - 'CURL_HTTP_VERSION_1_0' => array('4.0.2', ''), - 'CURL_HTTP_VERSION_1_1' => array('4.0.2', ''), - 'CURL_HTTP_VERSION_NONE' => array('4.0.2', ''), - 'CURL_IPRESOLVE_V4' => array('5.3.0', ''), - 'CURL_IPRESOLVE_V6' => array('5.3.0', ''), - 'CURL_IPRESOLVE_WHATEVER' => array('5.3.0', ''), -+ 'CURL_LOCK_DATA_COOKIE' => array('5.5.0-dev', ''), -+ 'CURL_LOCK_DATA_DNS' => array('5.5.0-dev', ''), -+ 'CURL_LOCK_DATA_SSL_SESSION' => array('5.5.0-dev', ''), - 'CURL_NETRC_IGNORED' => array('4.0.2', ''), - 'CURL_NETRC_OPTIONAL' => array('4.0.2', ''), - 'CURL_NETRC_REQUIRED' => array('4.0.2', ''), -+ 'CURL_RTSPREQ_ANNOUNCE' => array('5.5.0-dev', ''), -+ 'CURL_RTSPREQ_DESCRIBE' => array('5.5.0-dev', ''), -+ 'CURL_RTSPREQ_GET_PARAMETER' => array('5.5.0-dev', ''), -+ 'CURL_RTSPREQ_OPTIONS' => array('5.5.0-dev', ''), -+ 'CURL_RTSPREQ_PAUSE' => array('5.5.0-dev', ''), -+ 'CURL_RTSPREQ_PLAY' => array('5.5.0-dev', ''), -+ 'CURL_RTSPREQ_RECEIVE' => array('5.5.0-dev', ''), -+ 'CURL_RTSPREQ_RECORD' => array('5.5.0-dev', ''), -+ 'CURL_RTSPREQ_SETUP' => array('5.5.0-dev', ''), -+ 'CURL_RTSPREQ_SET_PARAMETER' => array('5.5.0-dev', ''), -+ 'CURL_RTSPREQ_TEARDOWN' => array('5.5.0-dev', ''), -+ 'CURL_SSLVERSION_DEFAULT' => array('5.5.0-dev', ''), -+ 'CURL_SSLVERSION_SSLv2' => array('5.5.0-dev', ''), -+ 'CURL_SSLVERSION_SSLv3' => array('5.5.0-dev', ''), -+ 'CURL_SSLVERSION_TLSv1' => array('5.5.0-dev', ''), - 'CURL_TIMECOND_IFMODSINCE' => array('4.0.2', ''), - 'CURL_TIMECOND_IFUNMODSINCE' => array('4.0.2', ''), - 'CURL_TIMECOND_LASTMOD' => array('4.0.2', ''), -+ 'CURL_TIMECOND_NONE' => array('5.5.0-dev', ''), -+ 'CURL_TLSAUTH_SRP' => array('5.5.0-dev', ''), - 'CURL_VERSION_IPV6' => array('4.0.2', ''), - 'CURL_VERSION_KERBEROS4' => array('4.0.2', ''), - 'CURL_VERSION_LIBZ' => array('4.0.2', ''), -@@ -142,8 +171,11 @@ class PHP_CompatInfo_Reference_Curl - 'CURLAUTH_ANYSAFE' => array('4.0.2', ''), - 'CURLAUTH_BASIC' => array('4.0.2', ''), - 'CURLAUTH_DIGEST' => array('4.0.2', ''), -+ 'CURLAUTH_DIGEST_IE' => array('5.5.0-dev', ''), - 'CURLAUTH_GSSNEGOTIATE' => array('4.0.2', ''), -+ 'CURLAUTH_NONE' => array('5.5.0-dev', ''), - 'CURLAUTH_NTLM' => array('4.0.2', ''), -+ 'CURLAUTH_ONLY' => array('5.5.0-dev', ''), - - 'CURLCLOSEPOLICY_CALLBACK' => array('4.0.2', ''), - 'CURLCLOSEPOLICY_LEAST_RECENTLY_USED' -@@ -157,6 +189,7 @@ class PHP_CompatInfo_Reference_Curl - 'CURLE_BAD_CONTENT_ENCODING' => array('4.0.2', ''), - 'CURLE_BAD_FUNCTION_ARGUMENT' => array('4.0.2', ''), - 'CURLE_BAD_PASSWORD_ENTERED' => array('4.0.2', ''), -+ 'CURLE_BAD_DOWNLOAD_RESUME' => array('5.5.0-dev', ''), - 'CURLE_COULDNT_CONNECT' => array('4.0.2', ''), - 'CURLE_COULDNT_RESOLVE_HOST' => array('4.0.2', ''), - 'CURLE_COULDNT_RESOLVE_PROXY' => array('4.0.2', ''), -@@ -190,6 +223,7 @@ class PHP_CompatInfo_Reference_Curl - 'CURLE_HTTP_PORT_FAILED' => array('4.0.2', ''), - 'CURLE_HTTP_POST_ERROR' => array('4.0.2', ''), - 'CURLE_HTTP_RANGE_ERROR' => array('4.0.2', ''), -+ 'CURLE_HTTP_RETURNED_ERROR' => array('5.5.0-dev', ''), - 'CURLE_LDAP_CANNOT_BIND' => array('4.0.2', ''), - 'CURLE_LDAP_INVALID_URL' => array('4.0.2', ''), - 'CURLE_LDAP_SEARCH_FAILED' => array('4.0.2', ''), -@@ -198,6 +232,7 @@ class PHP_CompatInfo_Reference_Curl - 'CURLE_OBSOLETE' => array('4.0.2', ''), - 'CURLE_OK' => array('4.0.2', ''), - 'CURLE_OPERATION_TIMEOUTED' => array('4.0.2', ''), -+ 'CURLE_OPERATION_TIMEDOUT' => array('5.5.0-dev', ''), - 'CURLE_OUT_OF_MEMORY' => array('4.0.2', ''), - 'CURLE_PARTIAL_FILE' => array('4.0.2', ''), - 'CURLE_READ_ERROR' => array('4.0.2', ''), -@@ -229,36 +264,55 @@ class PHP_CompatInfo_Reference_Curl - 'CURLFTPMETHOD_SINGLECWD' => array('5.3.0', ''), - - 'CURLFTPSSL_ALL' => array('5.2.0', ''), -+ 'CURLFTPSSL_CCC_ACTIVE' => array('5.5.0-dev', ''), -+ 'CURLFTPSSL_CCC_NONE' => array('5.5.0-dev', ''), -+ 'CURLFTPSSL_CCC_PASSIVE' => array('5.5.0-dev', ''), - 'CURLFTPSSL_CONTROL' => array('5.2.0', ''), - 'CURLFTPSSL_NONE' => array('5.2.0', ''), - 'CURLFTPSSL_TRY' => array('4.0.2', ''), - -+ 'CURLINFO_APPCONNECT_TIME' => array('5.5.0-dev', ''), - 'CURLINFO_CERTINFO' => array('5.3.2', ''), -+ 'CURLINFO_CONDITION_UNMET' => array('5.5.0-dev', ''), - 'CURLINFO_CONNECT_TIME' => array('4.0.2', ''), - 'CURLINFO_CONTENT_LENGTH_DOWNLOAD' - => array('4.0.2', ''), - 'CURLINFO_CONTENT_LENGTH_UPLOAD' => array('4.0.2', ''), - 'CURLINFO_CONTENT_TYPE' => array('4.0.2', ''), -+ 'CURLINFO_COOKIELIST' => array('5.5.0-dev', ''), - 'CURLINFO_EFFECTIVE_URL' => array('4.0.2', ''), - 'CURLINFO_FILETIME' => array('4.0.2', ''), -+ 'CURLINFO_FTP_ENTRY_PATH' => array('5.5.0-dev', ''), - 'CURLINFO_HEADER_OUT' => array('5.1.3', ''), - 'CURLINFO_HEADER_SIZE' => array('4.0.2', ''), -+ 'CURLINFO_HTTPAUTH_AVAIL' => array('5.5.0-dev', ''), - 'CURLINFO_HTTP_CODE' => array('4.0.2', ''), -+ 'CURLINFO_HTTP_CONNECTCODE' => array('5.5.0-dev', ''), -+ 'CURLINFO_LASTONE' => array('5.5.0-dev', ''), - 'CURLINFO_LOCAL_IP' => array('5.4.7', ''), - 'CURLINFO_LOCAL_PORT' => array('5.4.7', ''), - 'CURLINFO_NAMELOOKUP_TIME' => array('4.0.2', ''), -+ 'CURLINFO_NUM_CONNECTS' => array('5.5.0-dev', ''), -+ 'CURLINFO_OS_ERRNO' => array('5.5.0-dev', ''), - 'CURLINFO_PRETRANSFER_TIME' => array('4.0.2', ''), - 'CURLINFO_PRIMARY_IP' => array('5.4.7', ''), - 'CURLINFO_PRIMARY_PORT' => array('5.4.7', ''), - 'CURLINFO_PRIVATE' => array('5.2.4', ''), -+ 'CURLINFO_PROXYAUTH_AVAIL' => array('5.5.0-dev', ''), - 'CURLINFO_REDIRECT_COUNT' => array('4.0.2', ''), - 'CURLINFO_REDIRECT_TIME' => array('4.0.2', ''), - 'CURLINFO_REDIRECT_URL' => array('5.3.7', ''), - 'CURLINFO_REQUEST_SIZE' => array('4.0.2', ''), -+ 'CURLINFO_RESPONSE_CODE' => array('5.5.0-dev', ''), -+ 'CURLINFO_RTSP_CLIENT_CSEQ' => array('5.5.0-dev', ''), -+ 'CURLINFO_RTSP_CSEQ_RECV' => array('5.5.0-dev', ''), -+ 'CURLINFO_RTSP_SERVER_CSEQ' => array('5.5.0-dev', ''), -+ 'CURLINFO_RTSP_SESSION_ID' => array('5.5.0-dev', ''), - 'CURLINFO_SIZE_DOWNLOAD' => array('4.0.2', ''), - 'CURLINFO_SIZE_UPLOAD' => array('4.0.2', ''), - 'CURLINFO_SPEED_DOWNLOAD' => array('4.0.2', ''), - 'CURLINFO_SPEED_UPLOAD' => array('4.0.2', ''), -+ 'CURLINFO_SSL_ENGINES' => array('5.5.0-dev', ''), - 'CURLINFO_SSL_VERIFYRESULT' => array('4.0.2', ''), - 'CURLINFO_STARTTRANSFER_TIME' => array('4.0.2', ''), - 'CURLINFO_TOTAL_TIME' => array('4.0.2', ''), -@@ -272,6 +326,9 @@ class PHP_CompatInfo_Reference_Curl - - 'CURLMSG_DONE' => array('4.0.2', ''), - -+ 'CURLOPT_ACCEPT_ENCODING' => array('5.5.0-dev', ''), -+ 'CURLOPT_ADDRESS_SCOPE' => array('5.5.0-dev', ''), -+ 'CURLOPT_APPEND' => array('5.5.0-dev', ''), - 'CURLOPT_AUTOREFERER' => array('5.1.0', ''), - 'CURLOPT_BINARYTRANSFER' => array('4.0.2', ''), - 'CURLOPT_BUFFERSIZE' => array('4.0.2', ''), -@@ -279,21 +336,27 @@ class PHP_CompatInfo_Reference_Curl - 'CURLOPT_CAPATH' => array('4.0.2', ''), - 'CURLOPT_CERTINFO' => array('5.3.2', ''), - 'CURLOPT_CLOSEPOLICY' => array('4.0.2', ''), -+ 'CURLOPT_CONNECT_ONLY' => array('5.5.0-dev', ''), - 'CURLOPT_CONNECTTIMEOUT' => array('4.0.2', ''), - 'CURLOPT_CONNECTTIMEOUT_MS' => array('4.0.2', ''), - 'CURLOPT_COOKIE' => array('4.0.2', ''), - 'CURLOPT_COOKIEFILE' => array('4.0.2', ''), -+ 'CURLOPT_COOKIELIST' => array('5.5.0-dev', ''), - 'CURLOPT_COOKIEJAR' => array('4.0.2', ''), - 'CURLOPT_COOKIESESSION' => array('5.1.0', ''), - 'CURLOPT_CRLF' => array('4.0.2', ''), -+ 'CURLOPT_CRLFILE' => array('5.5.0-dev', ''), - 'CURLOPT_CUSTOMREQUEST' => array('4.0.2', ''), -+ 'CURLOPT_DIRLISTONLY' => array('5.5.0-dev', ''), - 'CURLOPT_DNS_CACHE_TIMEOUT' => array('4.0.2', ''), -+ 'CURLOPT_DNS_SERVERS' => array('5.5.0-dev', ''), - 'CURLOPT_DNS_USE_GLOBAL_CACHE' => array('4.0.2', ''), - 'CURLOPT_EGDSOCKET' => array('4.0.2', ''), - 'CURLOPT_ENCODING' => array('4.0.2', ''), - 'CURLOPT_FAILONERROR' => array('4.0.2', ''), - 'CURLOPT_FILE' => array('4.0.2', ''), - 'CURLOPT_FILETIME' => array('4.0.2', ''), -+ 'CURLOPT_FNMATCH_FUNCTION' => array('5.5.0-dev', ''), - 'CURLOPT_FOLLOWLOCATION' => array('4.0.2', ''), - 'CURLOPT_FORBID_REUSE' => array('4.0.2', ''), - 'CURLOPT_FRESH_CONNECT' => array('4.0.2', ''), -@@ -301,13 +364,18 @@ class PHP_CompatInfo_Reference_Curl - 'CURLOPT_FTPLISTONLY' => array('4.0.2', ''), - 'CURLOPT_FTPPORT' => array('4.0.2', ''), - 'CURLOPT_FTPSSLAUTH' => array('5.1.0', ''), -+ 'CURLOPT_FTP_ACCOUNT' => array('5.5.0-dev', ''), -+ 'CURLOPT_FTP_ALTERNATIVE_TO_USER'=> array('5.5.0-dev', ''), - 'CURLOPT_FTP_CREATE_MISSING_DIRS' - => array('4.0.2', ''), - 'CURLOPT_FTP_FILEMETHOD' => array('5.3.0', ''), -+ 'CURLOPT_FTP_RESPONSE_TIMEOUT' => array('5.5.0-dev', ''), - 'CURLOPT_FTP_SKIP_PASV_IP' => array('5.3.2', ''), - 'CURLOPT_FTP_SSL' => array('5.2.0', ''), -+ 'CURLOPT_FTP_SSL_CCC' => array('5.5.0-dev', ''), - 'CURLOPT_FTP_USE_EPRT' => array('4.0.2', ''), - 'CURLOPT_FTP_USE_EPSV' => array('4.0.2', ''), -+ 'CURLOPT_FTP_USE_PRET' => array('5.5.0-dev', ''), - 'CURLOPT_HEADER' => array('4.0.2', ''), - 'CURLOPT_HEADERFUNCTION' => array('4.0.2', ''), - 'CURLOPT_HTTP200ALIASES' => array('4.0.2', ''), -@@ -315,38 +383,57 @@ class PHP_CompatInfo_Reference_Curl - 'CURLOPT_HTTPGET' => array('4.0.2', ''), - 'CURLOPT_HTTPHEADER' => array('4.0.2', ''), - 'CURLOPT_HTTPPROXYTUNNEL' => array('4.0.2', ''), -+ 'CURLOPT_HTTP_CONTENT_DECODING' => array('5.5.0-dev', ''), -+ 'CURLOPT_HTTP_TRANSFER_DECODING' => array('5.5.0-dev', ''), - 'CURLOPT_HTTP_VERSION' => array('4.0.2', ''), -+ 'CURLOPT_IGNORE_CONTENT_LENGTH' => array('5.5.0-dev', ''), - 'CURLOPT_INFILE' => array('4.0.2', ''), - 'CURLOPT_INFILESIZE' => array('4.0.2', ''), - 'CURLOPT_INTERFACE' => array('4.0.2', ''), - 'CURLOPT_IPRESOLVE' => array('5.3.0', ''), -+ 'CURLOPT_ISSUERCERT' => array('5.5.0-dev', ''), - 'CURLOPT_KEYPASSWD' => array('5.3.0', ''), -+ 'CURLOPT_KRBLEVEL' => array('5.5.0-dev', ''), - 'CURLOPT_KRB4LEVEL' => array('4.0.2', ''), -+ 'CURLOPT_LOCALPORT' => array('5.5.0-dev', ''), -+ 'CURLOPT_LOCALPORTRANGE' => array('5.5.0-dev', ''), - 'CURLOPT_LOW_SPEED_LIMIT' => array('4.0.2', ''), - 'CURLOPT_LOW_SPEED_TIME' => array('4.0.2', ''), -+ 'CURLOPT_MAIL_FROM' => array('5.5.0-dev', ''), -+ 'CURLOPT_MAIL_RCPT' => array('5.5.0-dev', ''), - 'CURLOPT_MAXCONNECTS' => array('4.0.2', ''), -+ 'CURLOPT_MAXFILESIZE' => array('5.5.0-dev', ''), - 'CURLOPT_MAXREDIRS' => array('4.0.2', ''), - 'CURLOPT_MAX_RECV_SPEED_LARGE' => array('5.3.7', ''), - 'CURLOPT_MAX_SEND_SPEED_LARGE' => array('5.3.7', ''), - 'CURLOPT_MUTE' => array('4.0.2', ''), - 'CURLOPT_NETRC' => array('4.0.2', ''), -+ 'CURLOPT_NETRC_FILE' => array('5.5.0-dev', ''), -+ 'CURLOPT_NEW_DIRECTORY_PERMS' => array('5.5.0-dev', ''), -+ 'CURLOPT_NEW_FILE_PERMS' => array('5.5.0-dev', ''), - 'CURLOPT_NOBODY' => array('4.0.2', ''), - 'CURLOPT_NOPROGRESS' => array('4.0.2', ''), -+ 'CURLOPT_NOPROXY' => array('5.5.0-dev', ''), - 'CURLOPT_NOSIGNAL' => array('4.0.2', ''), -+ 'CURLOPT_PASSWORD' => array('5.5.0-dev', ''), - 'CURLOPT_PASSWDFUNCTION' => array('4.0.2', ''), - 'CURLOPT_PORT' => array('4.0.2', ''), - 'CURLOPT_POST' => array('4.0.2', ''), - 'CURLOPT_POSTFIELDS' => array('4.0.2', ''), - 'CURLOPT_POSTQUOTE' => array('4.0.2', ''), - 'CURLOPT_POSTREDIR' => array('5.3.2', ''), -+ 'CURLOPT_PREQUOTE' => array('5.5.0-dev', ''), - 'CURLOPT_PRIVATE' => array('5.2.4', ''), - 'CURLOPT_PROGRESSFUNCTION' => array('5.3.0', ''), - 'CURLOPT_PROTOCOLS' => array('4.0.2', ''), - 'CURLOPT_PROXY' => array('4.0.2', ''), - 'CURLOPT_PROXYAUTH' => array('4.0.2', ''), -+ 'CURLOPT_PROXYPASSWORD' => array('5.5.0-dev', ''), -+ 'CURLOPT_PROXYUSERNAME' => array('5.5.0-dev', ''), - 'CURLOPT_PROXYPORT' => array('4.0.2', ''), - 'CURLOPT_PROXYTYPE' => array('4.0.2', ''), - 'CURLOPT_PROXYUSERPWD' => array('4.0.2', ''), -+ 'CURLOPT_PROXY_TRANSFER_MODE' => array('5.5.0-dev', ''), - 'CURLOPT_PUT' => array('4.0.2', ''), - 'CURLOPT_QUOTE' => array('4.0.2', ''), - 'CURLOPT_RANDOM_FILE' => array('4.0.2', ''), -@@ -356,10 +443,21 @@ class PHP_CompatInfo_Reference_Curl - 'CURLOPT_REDIR_PROTOCOLS' => array('4.0.2', ''), - 'CURLOPT_REFERER' => array('4.0.2', ''), - 'CURLOPT_RESUME_FROM' => array('4.0.2', ''), -+ 'CURLOPT_RESOLVE' => array('5.5.0-dev', ''), - 'CURLOPT_RETURNTRANSFER' => array('4.0.2', ''), -+ 'CURLOPT_RTSP_CLIENT_CSEQ' => array('5.5.0-dev', ''), -+ 'CURLOPT_RTSP_REQUEST' => array('5.5.0-dev', ''), -+ 'CURLOPT_RTSP_SERVER_CSEQ' => array('5.5.0-dev', ''), -+ '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_SHARE' => array('5.5.0-dev', ''), -+ 'CURLOPT_SOCKS5_GSSAPI_NEC' => array('5.5.0-dev', ''), -+ 'CURLOPT_SOCKS5_GSSAPI_SERVICE' => array('5.5.0-dev', ''), - 'CURLOPT_SSH_AUTH_TYPES' => array('5.3.0', ''), - 'CURLOPT_SSH_HOST_PUBLIC_KEY_MD5' - => array('5.3.0', ''), -+ 'CURLOPT_SSH_KNOWNHOSTS' => array('5.5.0-dev', ''), - 'CURLOPT_SSH_PRIVATE_KEYFILE' => array('5.3.0', ''), - 'CURLOPT_SSH_PUBLIC_KEYFILE' => array('5.3.0', ''), - 'CURLOPT_SSLCERT' => array('4.0.2', ''), -@@ -372,21 +470,30 @@ class PHP_CompatInfo_Reference_Curl - 'CURLOPT_SSLKEYTYPE' => array('4.0.2', ''), - 'CURLOPT_SSLVERSION' => array('4.0.2', ''), - 'CURLOPT_SSL_CIPHER_LIST' => array('4.0.2', ''), -+ 'CURLOPT_SSL_SESSIONID_CACHE' => array('5.5.0-dev', ''), - 'CURLOPT_SSL_VERIFYHOST' => array('4.0.2', ''), - 'CURLOPT_SSL_VERIFYPEER' => array('4.0.2', ''), - 'CURLOPT_STDERR' => array('4.0.2', ''), - 'CURLOPT_TCP_NODELAY' => array('5.2.1', ''), -+ 'CURLOPT_TFTP_BLKSIZE' => array('5.5.0-dev', ''), - 'CURLOPT_TIMECONDITION' => array('4.0.2', ''), - 'CURLOPT_TIMEOUT' => array('4.0.2', ''), - 'CURLOPT_TIMEOUT_MS' => array('4.0.2', ''), - 'CURLOPT_TIMEVALUE' => array('4.0.2', ''), -+ 'CURLOPT_TLSAUTH_PASSWORD' => array('5.5.0-dev', ''), -+ 'CURLOPT_TLSAUTH_TYPE' => array('5.5.0-dev', ''), -+ 'CURLOPT_TLSAUTH_USERNAME' => array('5.5.0-dev', ''), - 'CURLOPT_TRANSFERTEXT' => array('4.0.2', ''), -+ 'CURLOPT_TRANSFER_ENCODING' => array('5.5.0-dev', ''), - 'CURLOPT_UNRESTRICTED_AUTH' => array('4.0.2', ''), - 'CURLOPT_UPLOAD' => array('4.0.2', ''), - 'CURLOPT_URL' => array('4.0.2', ''), - 'CURLOPT_USERAGENT' => array('4.0.2', ''), -+ 'CURLOPT_USERNAME' => array('5.5.0-dev', ''), - 'CURLOPT_USERPWD' => array('4.0.2', ''), -+ 'CURLOPT_USE_SSL' => array('5.5.0-dev', ''), - 'CURLOPT_VERBOSE' => array('4.0.2', ''), -+ 'CURLOPT_WILDCARDMATCH' => array('5.5.0-dev', ''), - 'CURLOPT_WRITEFUNCTION' => array('4.0.2', ''), - 'CURLOPT_WRITEHEADER' => array('4.0.2', ''), - -@@ -395,12 +502,26 @@ class PHP_CompatInfo_Reference_Curl - 'CURLPROTO_FILE' => array('4.0.2', ''), - 'CURLPROTO_FTP' => array('4.0.2', ''), - 'CURLPROTO_FTPS' => array('4.0.2', ''), -+ 'CURLPROTO_GOPHER' => array('5.5.0-dev', ''), - 'CURLPROTO_HTTP' => array('4.0.2', ''), - 'CURLPROTO_HTTPS' => array('4.0.2', ''), -+ 'CURLPROTO_IMAP' => array('5.5.0-dev', ''), -+ 'CURLPROTO_IMAPS' => array('5.5.0-dev', ''), - 'CURLPROTO_LDAP' => array('4.0.2', ''), - 'CURLPROTO_LDAPS' => array('4.0.2', ''), -+ 'CURLPROTO_POP3' => array('5.5.0-dev', ''), -+ 'CURLPROTO_POP3S' => array('5.5.0-dev', ''), -+ 'CURLPROTO_RTMP' => array('5.5.0-dev', ''), -+ 'CURLPROTO_RTMPE' => array('5.5.0-dev', ''), -+ 'CURLPROTO_RTMPS' => array('5.5.0-dev', ''), -+ 'CURLPROTO_RTMPT' => array('5.5.0-dev', ''), -+ 'CURLPROTO_RTMPTE' => array('5.5.0-dev', ''), -+ 'CURLPROTO_RTMPTS' => array('5.5.0-dev', ''), -+ 'CURLPROTO_RTSP' => array('5.5.0-dev', ''), - 'CURLPROTO_SCP' => array('4.0.2', ''), - 'CURLPROTO_SFTP' => array('4.0.2', ''), -+ 'CURLPROTO_SMTP' => array('5.5.0-dev', ''), -+ 'CURLPROTO_SMTPS' => array('5.5.0-dev', ''), - 'CURLPROTO_TELNET' => array('4.0.2', ''), - 'CURLPROTO_TFTP' => array('4.0.2', ''), - -@@ -408,6 +529,11 @@ class PHP_CompatInfo_Reference_Curl - 'CURLPROXY_SOCKS4' => array('5.2.10', ''), - 'CURLPROXY_SOCKS5' => array('4.0.2', ''), - -+ 'CURLSHOPT_NONE' => array('5.5.0-dev', ''), -+ 'CURLSHOPT_SHARE' => array('5.5.0-dev', ''), -+ 'CURLSHOPT_UNSHARE' => array('5.5.0-dev', ''), -+ -+ 'CURLSSH_AUTH_ANY' => array('5.5.0-dev', ''), - 'CURLSSH_AUTH_DEFAULT' => array('5.3.0', ''), - 'CURLSSH_AUTH_HOST' => array('5.3.0', ''), - 'CURLSSH_AUTH_KEYBOARD' => array('5.3.0', ''), -@@ -415,6 +541,11 @@ class PHP_CompatInfo_Reference_Curl - 'CURLSSH_AUTH_PASSWORD' => array('5.3.0', ''), - 'CURLSSH_AUTH_PUBLICKEY' => array('5.3.0', ''), - -+ 'CURLUSESSL_ALL' => array('5.5.0-dev', ''), -+ 'CURLUSESSL_CONTROL' => array('5.5.0-dev', ''), -+ 'CURLUSESSL_NONE' => array('5.5.0-dev', ''), -+ 'CURLUSESSL_TRY' => array('5.5.0-dev', ''), -+ - 'CURLVERSION_NOW' => array('4.0.2', ''), - ); - $this->applyFilter($release, $items, $constants); --- -1.7.11.7 - diff --git a/0002-hash-reference-for-php-5.5.patch b/0002-hash-reference-for-php-5.5.patch deleted file mode 100644 index 779dc5f..0000000 --- a/0002-hash-reference-for-php-5.5.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 723084d34270773b434740c9ca4fabd1a99ffa26 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Sat, 1 Dec 2012 18:26:57 +0100 -Subject: [PATCH 02/17] hash reference for php 5.5 - ---- - PHP/CompatInfo/Reference/hash.php | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/PHP/CompatInfo/Reference/hash.php b/PHP/CompatInfo/Reference/hash.php -index 616af0b..1f44f63 100644 ---- a/PHP/CompatInfo/Reference/hash.php -+++ b/PHP/CompatInfo/Reference/hash.php -@@ -120,6 +120,12 @@ class PHP_CompatInfo_Reference_Hash - ); - $this->applyFilter($release, $items, $functions); - -+ $release = '5.5.0'; // soon -+ $items = array( -+ 'hash_pbkdf2' => array('5.5.0-dev', ''), -+ ); -+ $this->applyFilter($release, $items, $functions); -+ - return $functions; - } - --- -1.7.11.7 - diff --git a/0003-tokoniser-reference-for-php-5.5.patch b/0003-tokoniser-reference-for-php-5.5.patch deleted file mode 100644 index 5afd41f..0000000 --- a/0003-tokoniser-reference-for-php-5.5.patch +++ /dev/null @@ -1,32 +0,0 @@ -From de9aed8e22cdd55a20e038b832cdca033eee6fd6 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Sat, 1 Dec 2012 19:38:19 +0100 -Subject: [PATCH 03/17] tokoniser reference for php 5.5 - ---- - PHP/CompatInfo/Reference/tokenizer.php | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/PHP/CompatInfo/Reference/tokenizer.php b/PHP/CompatInfo/Reference/tokenizer.php -index 36d4b6c..3af0bea 100644 ---- a/PHP/CompatInfo/Reference/tokenizer.php -+++ b/PHP/CompatInfo/Reference/tokenizer.php -@@ -215,6 +215,7 @@ class PHP_CompatInfo_Reference_Tokenizer - 'T_CLONE' => array('5.0.0', ''), - 'T_DIR' => array('5.3.0', ''), - 'T_FINAL' => array('5.0.0', ''), -+ 'T_FINALLY' => array('5.5.0-dev', ''), - 'T_GOTO' => array('5.3.0', ''), - 'T_HALT_COMPILER' => array('5.1.0', ''), - 'T_IMPLEMENTS' => array('5.0.0', ''), -@@ -234,6 +235,7 @@ class PHP_CompatInfo_Reference_Tokenizer - 'T_THROW' => array('5.0.0', ''), - 'T_UNSET_CAST' => array('5.0.0', ''), - 'T_USE' => array('5.3.0', ''), -+ 'T_YIELD' => array('5.5.0-dev', ''), - ); - $this->applyFilter($release, $items, $constants); - --- -1.7.11.7 - diff --git a/0004-standard-reference-for-php-5.5.patch b/0004-standard-reference-for-php-5.5.patch deleted file mode 100644 index 2517751..0000000 --- a/0004-standard-reference-for-php-5.5.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 92c973781339b78ad0bdae57c162cca4d454ce19 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Sat, 1 Dec 2012 19:42:53 +0100 -Subject: [PATCH 04/17] standard reference for php 5.5 - ---- - PHP/CompatInfo/Reference/standard.php | 24 +++++++++++++++++++++--- - 1 file changed, 21 insertions(+), 3 deletions(-) - -diff --git a/PHP/CompatInfo/Reference/standard.php b/PHP/CompatInfo/Reference/standard.php -index ede6788..5defb23 100644 ---- a/PHP/CompatInfo/Reference/standard.php -+++ b/PHP/CompatInfo/Reference/standard.php -@@ -333,8 +333,8 @@ class PHP_CompatInfo_Reference_Standard - 'passthru' => array('4.0.0', ''), - 'pclose' => array('4.0.0', ''), - 'pfsockopen' => array('4.0.0', ''), -- 'php_logo_guid' => array('4.0.0', ''), -- 'php_real_logo_guid' => array('4.0.0', ''), -+ 'php_logo_guid' => array('4.0.0', '5.4.9'), -+ 'php_real_logo_guid' => array('4.0.0', '5.4.9'), - 'phpcredits' => array('4.0.0', ''), - 'phpinfo' => array('4.0.0', ''), - 'phpversion' => array('4.0.0', ''), -@@ -437,7 +437,7 @@ class PHP_CompatInfo_Reference_Standard - 'usleep' => array('4.0.0', ''), - 'usort' => array('4.0.0', ''), - 'var_dump' => array('4.0.0', ''), -- 'zend_logo_guid' => array('4.0.0', ''), -+ 'zend_logo_guid' => array('4.0.0', '5.4.9'), - ); - $this->applyFilter($release, $items, $functions); - -@@ -749,6 +749,16 @@ class PHP_CompatInfo_Reference_Standard - ); - $this->applyFilter($release, $items, $functions); - -+ $release = '5.5.0'; // soon -+ $items = array( -+ 'boolval' => array('5.5.0-dev', ''), -+ 'password_get_info' => array('5.5.0-dev', ''), -+ 'password_hash' => array('5.5.0-dev', ''), -+ 'password_needs_rehash' => array('5.5.0-dev', ''), -+ 'password_verify' => array('5.5.0-dev', ''), -+ ); -+ $this->applyFilter($release, $items, $functions); -+ - return $functions; - } - -@@ -1174,6 +1184,14 @@ class PHP_CompatInfo_Reference_Standard - ); - $this->applyFilter($release, $items, $constants); - -+ $release = '5.5.0'; // soon -+ $items = array( -+ 'PASSWORD_DEFAULT' => array('5.5.0-dev', ''), -+ 'PASSWORD_BCRYPT' => array('5.5.0-dev', ''), -+ 'PASSWORD_BCRYPT_DEFAULT_COST' => array('5.5.0-dev', ''), -+ ); -+ $this->applyFilter($release, $items, $constants); -+ - return $constants; - } - --- -1.7.11.7 - diff --git a/0006-openssl-reference-for-php-5.5.patch b/0006-openssl-reference-for-php-5.5.patch deleted file mode 100644 index c147a1e..0000000 --- a/0006-openssl-reference-for-php-5.5.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5a14d016dca96d296838156aa87bee03a8f8da32 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Sat, 1 Dec 2012 20:24:52 +0100 -Subject: [PATCH 06/17] openssl reference for php 5.5 - ---- - PHP/CompatInfo/Reference/openssl.php | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/PHP/CompatInfo/Reference/openssl.php b/PHP/CompatInfo/Reference/openssl.php -index f5cf3b5..804213a 100644 ---- a/PHP/CompatInfo/Reference/openssl.php -+++ b/PHP/CompatInfo/Reference/openssl.php -@@ -94,6 +94,7 @@ class PHP_CompatInfo_Reference_Openssl - 'openssl_get_privatekey' => array('4.0.4', ''), - 'openssl_get_publickey' => array('4.0.4', ''), - 'openssl_open' => array('4.0.4', ''), -+ 'openssl_pbkdf2' => array('5.5.0-dev', ''), - 'openssl_pkcs12_export' => array('5.2.2', ''), - 'openssl_pkcs12_export_to_file' => array('5.2.2', ''), - 'openssl_pkcs12_read' => array('5.2.2', ''), --- -1.7.11.7 - diff --git a/0007-mysqli-reference-for-php-5.5.patch b/0007-mysqli-reference-for-php-5.5.patch deleted file mode 100644 index daba98d..0000000 --- a/0007-mysqli-reference-for-php-5.5.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 461b03375329f2f2ace7b96b0274473e5544f0c2 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Sat, 1 Dec 2012 20:25:58 +0100 -Subject: [PATCH 07/17] mysqli reference for php 5.5 - ---- - PHP/CompatInfo/Reference/mysqli.php | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/PHP/CompatInfo/Reference/mysqli.php b/PHP/CompatInfo/Reference/mysqli.php -index a6f1b0c..82e7e8f 100644 ---- a/PHP/CompatInfo/Reference/mysqli.php -+++ b/PHP/CompatInfo/Reference/mysqli.php -@@ -319,6 +319,7 @@ class PHP_CompatInfo_Reference_Mysqli - 'MYSQLI_RPL_MASTER' => array('5.0.0', self::LATEST_PHP_5_2), - 'MYSQLI_RPL_SLAVE' => array('5.0.0', self::LATEST_PHP_5_2), - 'MYSQLI_SERVER_PS_OUT_PARAMS' => array('5.3.4', ''), -+ 'MYSQLI_SERVER_PUBLIC_KEY' => array('5.5.0-dev', ''), - 'MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED' - => array('5.3.0', ''), - 'MYSQLI_SERVER_QUERY_NO_INDEX_USED' --- -1.7.11.7 - diff --git a/0008-Fix-json-reference-for-PHP-5.5.patch b/0008-Fix-json-reference-for-PHP-5.5.patch deleted file mode 100644 index 762e865..0000000 --- a/0008-Fix-json-reference-for-PHP-5.5.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 15b732e5d955c58c9d9390151bf09a926e45f9b5 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Sun, 2 Dec 2012 07:22:18 +0100 -Subject: [PATCH 08/17] Fix json reference for PHP 5.5 - ---- - PHP/CompatInfo/Reference/json.php | 21 +++++++++++++++------ - 1 file changed, 15 insertions(+), 6 deletions(-) - -diff --git a/PHP/CompatInfo/Reference/json.php b/PHP/CompatInfo/Reference/json.php -index 1a7b291..06d00e7 100644 ---- a/PHP/CompatInfo/Reference/json.php -+++ b/PHP/CompatInfo/Reference/json.php -@@ -113,6 +113,12 @@ class PHP_CompatInfo_Reference_Json - ); - $this->applyFilter($release, $items, $functions); - -+ $release = '5.5.0'; // soon -+ $items = array( -+ 'json_last_error_msg' => array('5.5.0-dev', ''), -+ ); -+ $this->applyFilter($release, $items, $functions); -+ - return $functions; - } - -@@ -156,12 +162,6 @@ class PHP_CompatInfo_Reference_Json - ); - $this->applyFilter($release, $items, $constants); - -- $release = '5.3.14'; // 2012-06-06 -- $items = array( -- 'JSON_PARTIAL_OUTPUT_ON_ERROR' => array('5.3.14', '5.3.14'), -- ); -- $this->applyFilter($release, $items, $constants); -- - $release = '5.4.0'; // 2012-03-01 - $items = array( - 'JSON_BIGINT_AS_STRING' => array('5.4.0', ''), -@@ -172,6 +172,15 @@ class PHP_CompatInfo_Reference_Json - ); - $this->applyFilter($release, $items, $constants); - -+ $release = '5.5.0'; // soon -+ $items = array( -+ 'JSON_PARTIAL_OUTPUT_ON_ERROR' => array('5.5.0-dev', ''), -+ 'JSON_ERROR_RECURSION' => array('5.5.0-dev', ''), -+ 'JSON_ERROR_INF_OR_NAN' => array('5.5.0-dev', ''), -+ 'JSON_ERROR_UNSUPPORTED_TYPE' => array('5.5.0-dev', ''), -+ ); -+ $this->applyFilter($release, $items, $constants); -+ - return $constants; - } - --- -1.7.11.7 - diff --git a/0009-Fix-intl-reference-for-PHP-5.5.patch b/0009-Fix-intl-reference-for-PHP-5.5.patch deleted file mode 100644 index 5701312..0000000 --- a/0009-Fix-intl-reference-for-PHP-5.5.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 774226ac3c8cbc6938fa834b4c5fbf4f9681cabe Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Sun, 2 Dec 2012 07:51:58 +0100 -Subject: [PATCH 09/17] Fix intl reference for PHP 5.5 - ---- - PHP/CompatInfo/Reference/intl.php | 94 +++++++++++++++++++++++++++++++++++++++ - 1 file changed, 94 insertions(+) - -diff --git a/PHP/CompatInfo/Reference/intl.php b/PHP/CompatInfo/Reference/intl.php -index dcc7aad..68eadcb 100644 ---- a/PHP/CompatInfo/Reference/intl.php -+++ b/PHP/CompatInfo/Reference/intl.php -@@ -99,6 +99,7 @@ class PHP_CompatInfo_Reference_Intl - 'MessageFormatter' => array('5.2.0', ''), - 'Normalizer' => array('5.2.0', ''), - 'NumberFormatter' => array('5.2.0', ''), -+ 'IntlException' => array('5.2.0', ''), - ); - $this->applyFilter($release, $items, $classes); - -@@ -121,6 +122,19 @@ class PHP_CompatInfo_Reference_Intl - ); - $this->applyFilter($release, $items, $classes); - -+ $release = '5.5.0'; // soon -+ $items = array( -+ 'IntlBreakIterator' => array('5.5.0-dev', ''), -+ 'IntlCalendar' => array('5.5.0-dev', ''), -+ 'IntlCodePointBreakIterator' => array('5.5.0-dev', ''), -+ 'IntlGregorianCalendar' => array('5.5.0-dev', ''), -+ 'IntlIterator' => array('5.5.0-dev', ''), -+ 'IntlPartsIterator' => array('5.5.0-dev', ''), -+ 'IntlRuleBasedBreakIterator' => array('5.5.0-dev', ''), -+ 'IntlTimeZone' => array('5.5.0-dev', ''), -+ ); -+ $this->applyFilter($release, $items, $classes); -+ - return $classes; - } - -@@ -289,6 +303,86 @@ class PHP_CompatInfo_Reference_Intl - ); - $this->applyFilter($release, $items, $functions); - -+ $release = '5.5.0'; // soon -+ $items = array( -+ 'datefmt_format_object' => array('5.5.0-dev', ''), -+ 'datefmt_get_calendar_object' => array('5.5.0-dev', ''), -+ 'datefmt_get_timezone' => array('5.5.0-dev', ''), -+ 'datefmt_set_timezone' => array('5.5.0-dev', ''), -+ -+ 'intlgregcal_create_instance' => array('5.5.0-dev', ''), -+ 'intlgregcal_set_gregorian_change' => array('5.5.0-dev', ''), -+ 'intlgregcal_get_gregorian_change' => array('5.5.0-dev', ''), -+ 'intlgregcal_is_leap_year' => array('5.5.0-dev', ''), -+ -+ 'intlcal_add' => array('5.5.0-dev', ''), -+ 'intlcal_after' => array('5.5.0-dev', ''), -+ 'intlcal_before' => array('5.5.0-dev', ''), -+ 'intlcal_clear' => array('5.5.0-dev', ''), -+ 'intlcal_create_instance' => array('5.5.0-dev', ''), -+ 'intlcal_equals' => array('5.5.0-dev', ''), -+ 'intlcal_field_difference' => array('5.5.0-dev', ''), -+ 'intlcal_from_date_time' => array('5.5.0-dev', ''), -+ 'intlcal_get' => array('5.5.0-dev', ''), -+ 'intlcal_get_actual_maximum' => array('5.5.0-dev', ''), -+ 'intlcal_get_actual_minimum' => array('5.5.0-dev', ''), -+ 'intlcal_get_available_locales' => array('5.5.0-dev', ''), -+ 'intlcal_get_day_of_week_type' => array('5.5.0-dev', ''), -+ 'intlcal_get_error_code' => array('5.5.0-dev', ''), -+ 'intlcal_get_error_message' => array('5.5.0-dev', ''), -+ 'intlcal_get_first_day_of_week' => array('5.5.0-dev', ''), -+ 'intlcal_get_greatest_minimum' => array('5.5.0-dev', ''), -+ 'intlcal_get_keyword_values_for_locale' -+ => array('5.5.0-dev', ''), -+ 'intlcal_get_least_maximum' => array('5.5.0-dev', ''), -+ 'intlcal_get_locale' => array('5.5.0-dev', ''), -+ 'intlcal_get_maximum' => array('5.5.0-dev', ''), -+ 'intlcal_get_minimal_days_in_first_week' -+ => array('5.5.0-dev', ''), -+ 'intlcal_get_minimum' => array('5.5.0-dev', ''), -+ 'intlcal_get_now' => array('5.5.0-dev', ''), -+ 'intlcal_get_time' => array('5.5.0-dev', ''), -+ 'intlcal_get_time_zone' => array('5.5.0-dev', ''), -+ 'intlcal_get_type' => array('5.5.0-dev', ''), -+ 'intlcal_get_weekend_transition' => array('5.5.0-dev', ''), -+ 'intlcal_in_daylight_time' => array('5.5.0-dev', ''), -+ 'intlcal_is_equivalent_to' => array('5.5.0-dev', ''), -+ 'intlcal_is_lenient' => array('5.5.0-dev', ''), -+ 'intlcal_is_set' => array('5.5.0-dev', ''), -+ 'intlcal_is_weekend' => array('5.5.0-dev', ''), -+ 'intlcal_roll' => array('5.5.0-dev', ''), -+ 'intlcal_set' => array('5.5.0-dev', ''), -+ 'intlcal_set_first_day_of_week' => array('5.5.0-dev', ''), -+ 'intlcal_set_lenient' => array('5.5.0-dev', ''), -+ 'intlcal_set_time' => array('5.5.0-dev', ''), -+ 'intlcal_set_time_zone' => array('5.5.0-dev', ''), -+ 'intlcal_to_date_time' => array('5.5.0-dev', ''), -+ -+ 'intltz_count_equivalent_ids' => array('5.5.0-dev', ''), -+ 'intltz_create_default' => array('5.5.0-dev', ''), -+ 'intltz_create_enumeration' => array('5.5.0-dev', ''), -+ 'intltz_create_time_zone' => array('5.5.0-dev', ''), -+ 'intltz_create_time_zone_id_enumeration' -+ => array('5.5.0-dev', ''), -+ 'intltz_from_date_time_zone' => array('5.5.0-dev', ''), -+ 'intltz_get_canonical_id' => array('5.5.0-dev', ''), -+ 'intltz_get_equivalent_id' => array('5.5.0-dev', ''), -+ 'intltz_get_gmt' => array('5.5.0-dev', ''), -+ 'intltz_get_display_name' => array('5.5.0-dev', ''), -+ 'intltz_get_dst_savings' => array('5.5.0-dev', ''), -+ 'intltz_get_error_code' => array('5.5.0-dev', ''), -+ 'intltz_get_error_message' => array('5.5.0-dev', ''), -+ 'intltz_get_id' => array('5.5.0-dev', ''), -+ 'intltz_get_offset' => array('5.5.0-dev', ''), -+ 'intltz_get_raw_offset' => array('5.5.0-dev', ''), -+ 'intltz_get_region' => array('5.5.0-dev', ''), -+ 'intltz_get_tz_data_version' => array('5.5.0-dev', ''), -+ 'intltz_has_same_rules' => array('5.5.0-dev', ''), -+ 'intltz_to_date_time_zone' => array('5.5.0-dev', ''), -+ 'intltz_use_daylight_time' => array('5.5.0-dev', ''), -+ ); -+ $this->applyFilter($release, $items, $functions); -+ - return $functions; - } - --- -1.7.11.7 - diff --git a/0010-fix-Core-reference-for-PHP-5.5.patch b/0010-fix-Core-reference-for-PHP-5.5.patch deleted file mode 100644 index 4c7bc1a..0000000 --- a/0010-fix-Core-reference-for-PHP-5.5.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 388eb5f2155218c497c695c7e1a3c7d49c820f15 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Sun, 2 Dec 2012 08:35:53 +0100 -Subject: [PATCH 10/17] fix Core reference for PHP 5.5 - ---- - PHP/CompatInfo/Reference/core.php | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/PHP/CompatInfo/Reference/core.php b/PHP/CompatInfo/Reference/core.php -index 1cdf216..50e159f 100644 ---- a/PHP/CompatInfo/Reference/core.php -+++ b/PHP/CompatInfo/Reference/core.php -@@ -95,6 +95,12 @@ class PHP_CompatInfo_Reference_Core - ); - $this->applyFilter($release, $items, $classes); - -+ $release = '5.5.0'; // soon -+ $items = array( -+ 'Generator' => array('5.5.0-dev', ''), -+ ); -+ $this->applyFilter($release, $items, $classes); -+ - return $classes; - } - --- -1.7.11.7 - diff --git a/0011-fix-order-in-intl.patch b/0011-fix-order-in-intl.patch deleted file mode 100644 index f0cd8a2..0000000 --- a/0011-fix-order-in-intl.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 95d27dc13f2fadb20659f6bb99a2d81631585407 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Sun, 2 Dec 2012 08:36:14 +0100 -Subject: [PATCH 11/17] fix order in intl - ---- - PHP/CompatInfo/Reference/intl.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/PHP/CompatInfo/Reference/intl.php b/PHP/CompatInfo/Reference/intl.php -index 68eadcb..86c6d3d 100644 ---- a/PHP/CompatInfo/Reference/intl.php -+++ b/PHP/CompatInfo/Reference/intl.php -@@ -311,9 +311,9 @@ class PHP_CompatInfo_Reference_Intl - 'datefmt_set_timezone' => array('5.5.0-dev', ''), - - 'intlgregcal_create_instance' => array('5.5.0-dev', ''), -- 'intlgregcal_set_gregorian_change' => array('5.5.0-dev', ''), - 'intlgregcal_get_gregorian_change' => array('5.5.0-dev', ''), - 'intlgregcal_is_leap_year' => array('5.5.0-dev', ''), -+ 'intlgregcal_set_gregorian_change' => array('5.5.0-dev', ''), - - 'intlcal_add' => array('5.5.0-dev', ''), - 'intlcal_after' => array('5.5.0-dev', ''), --- -1.7.11.7 - diff --git a/0012-curl-reference-for-php-5.5-more.patch b/0012-curl-reference-for-php-5.5-more.patch deleted file mode 100644 index faa4be2..0000000 --- a/0012-curl-reference-for-php-5.5-more.patch +++ /dev/null @@ -1,70 +0,0 @@ -From b5370ab1d00045f7423e712921bb93b7938a32c1 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Sun, 30 Dec 2012 10:03:05 +0100 -Subject: [PATCH 12/17] curl reference for php 5.5 (more) - ---- - PHP/CompatInfo/Reference/curl.php | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/PHP/CompatInfo/Reference/curl.php b/PHP/CompatInfo/Reference/curl.php -index c12dc0f..e59bda4 100644 ---- a/PHP/CompatInfo/Reference/curl.php -+++ b/PHP/CompatInfo/Reference/curl.php -@@ -93,12 +93,16 @@ - 'curl_multi_init' => array('5.0.0', ''), - 'curl_multi_remove_handle' => array('5.0.0', ''), - 'curl_multi_select' => array('5.0.0', ''), -+ 'curl_multi_setopt' => array('5.5.0-dev', ''), -+ 'curl_multi_strerror' => array('5.5.0-dev', ''), -+ 'curl_pause' => array('5.5.0-dev', ''), - 'curl_reset' => array('5.5.0-dev', ''), - 'curl_setopt' => array('4.0.2', ''), - 'curl_setopt_array' => array('5.1.3', ''), - 'curl_share_close' => array('5.5.0-dev', ''), - 'curl_share_init' => array('5.5.0-dev', ''), - 'curl_share_setopt' => array('5.5.0-dev', ''), -+ 'curl_strerror' => array('5.5.0-dev', ''), - 'curl_unescape' => array('5.5.0-dev', ''), - 'curl_version' => array('4.0.2', ''), - ); -@@ -142,6 +146,7 @@ - 'CURL_NETRC_IGNORED' => array('4.0.2', ''), - 'CURL_NETRC_OPTIONAL' => array('4.0.2', ''), - 'CURL_NETRC_REQUIRED' => array('4.0.2', ''), -+ 'CURL_READFUNC_PAUSE' => array('5.5.0-dev', ''), - 'CURL_RTSPREQ_ANNOUNCE' => array('5.5.0-dev', ''), - 'CURL_RTSPREQ_DESCRIBE' => array('5.5.0-dev', ''), - 'CURL_RTSPREQ_GET_PARAMETER' => array('5.5.0-dev', ''), -@@ -166,6 +171,7 @@ - 'CURL_VERSION_KERBEROS4' => array('4.0.2', ''), - 'CURL_VERSION_LIBZ' => array('4.0.2', ''), - 'CURL_VERSION_SSL' => array('4.0.2', ''), -+ 'CURL_WRITEFUNC_PAUSE' => array('5.5.0-dev', ''), - - 'CURLAUTH_ANY' => array('4.0.2', ''), - 'CURLAUTH_ANYSAFE' => array('4.0.2', ''), -@@ -325,6 +330,9 @@ - 'CURLM_OK' => array('4.0.2', ''), - 'CURLM_OUT_OF_MEMORY' => array('4.0.2', ''), - -+ 'CURLMOPT_MAXCONNECTS' => array('5.5.0-dev', ''), -+ 'CURLMOPT_PIPELINING' => array('5.5.0-dev', ''), -+ - 'CURLMSG_DONE' => array('4.0.2', ''), - - 'CURLOPT_ACCEPT_ENCODING' => array('5.5.0-dev', ''), -@@ -498,6 +506,13 @@ - 'CURLOPT_WRITEFUNCTION' => array('4.0.2', ''), - 'CURLOPT_WRITEHEADER' => array('4.0.2', ''), - -+ 'CURLPAUSE_ALL' => array('5.5.0-dev', ''), -+ 'CURLPAUSE_CONT' => array('5.5.0-dev', ''), -+ 'CURLPAUSE_RECV' => array('5.5.0-dev', ''), -+ 'CURLPAUSE_RECV_CONT' => array('5.5.0-dev', ''), -+ 'CURLPAUSE_SEND' => array('5.5.0-dev', ''), -+ 'CURLPAUSE_SEND_CONT' => array('5.5.0-dev', ''), -+ - 'CURLPROTO_ALL' => array('4.0.2', ''), - 'CURLPROTO_DICT' => array('4.0.2', ''), - 'CURLPROTO_FILE' => array('4.0.2', ''), diff --git a/0013-use-LATEST_PHP_5_4-macro.patch b/0013-use-LATEST_PHP_5_4-macro.patch deleted file mode 100644 index c493857..0000000 --- a/0013-use-LATEST_PHP_5_4-macro.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 344bd579ee8f74f16fd2088d47362dc4d70c7f7c Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Sun, 30 Dec 2012 10:05:23 +0100 -Subject: [PATCH 13/17] use LATEST_PHP_5_4 macro - ---- - PHP/CompatInfo/Reference/standard.php | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/PHP/CompatInfo/Reference/standard.php b/PHP/CompatInfo/Reference/standard.php -index 5defb23..80ad678 100644 ---- a/PHP/CompatInfo/Reference/standard.php -+++ b/PHP/CompatInfo/Reference/standard.php -@@ -333,8 +333,8 @@ class PHP_CompatInfo_Reference_Standard - 'passthru' => array('4.0.0', ''), - 'pclose' => array('4.0.0', ''), - 'pfsockopen' => array('4.0.0', ''), -- 'php_logo_guid' => array('4.0.0', '5.4.9'), -- 'php_real_logo_guid' => array('4.0.0', '5.4.9'), -+ 'php_logo_guid' => array('4.0.0', self::LATEST_PHP_5_4), -+ 'php_real_logo_guid' => array('4.0.0', self::LATEST_PHP_5_4), - 'phpcredits' => array('4.0.0', ''), - 'phpinfo' => array('4.0.0', ''), - 'phpversion' => array('4.0.0', ''), -@@ -437,7 +437,7 @@ class PHP_CompatInfo_Reference_Standard - 'usleep' => array('4.0.0', ''), - 'usort' => array('4.0.0', ''), - 'var_dump' => array('4.0.0', ''), -- 'zend_logo_guid' => array('4.0.0', '5.4.9'), -+ 'zend_logo_guid' => array('4.0.0', self::LATEST_PHP_5_4), - ); - $this->applyFilter($release, $items, $functions); - --- -1.7.11.7 - diff --git a/0014-curl-reference-for-php-5.5-more.patch b/0014-curl-reference-for-php-5.5-more.patch deleted file mode 100644 index d1cf09d..0000000 --- a/0014-curl-reference-for-php-5.5-more.patch +++ /dev/null @@ -1,59 +0,0 @@ -From af2162b342b4e8a788a685a32b0b87a2b16c8d70 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Mon, 14 Jan 2013 18:03:33 +0100 -Subject: [PATCH 14/17] curl reference for php 5.5 (more) - ---- - PHP/CompatInfo/Reference/curl.php | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/PHP/CompatInfo/Reference/curl.php b/PHP/CompatInfo/Reference/curl.php -index e59bda4..19bf6f8 100644 ---- a/PHP/CompatInfo/Reference/curl.php -+++ b/PHP/CompatInfo/Reference/curl.php -@@ -212,6 +212,7 @@ class PHP_CompatInfo_Reference_Curl - 'CURLE_FTP_COULDNT_SET_BINARY' => array('4.0.2', ''), - 'CURLE_FTP_COULDNT_STOR_FILE' => array('4.0.2', ''), - 'CURLE_FTP_COULDNT_USE_REST' => array('4.0.2', ''), -+ 'CURLE_FTP_PARTIAL_FILE' => array('5.5.0-dev', ''), - 'CURLE_FTP_PORT_FAILED' => array('4.0.2', ''), - 'CURLE_FTP_QUOTE_ERROR' => array('4.0.2', ''), - 'CURLE_FTP_SSL_FAILED' => array('4.0.2', ''), -@@ -277,6 +278,10 @@ class PHP_CompatInfo_Reference_Curl - 'CURLFTPSSL_NONE' => array('5.2.0', ''), - 'CURLFTPSSL_TRY' => array('4.0.2', ''), - -+ 'CURLGSSAPI_DELEGATION_FLAG' => array('5.5.0-dev', ''), -+ 'CURLGSSAPI_DELEGATION_POLICY_FLAG' -+ => array('5.5.0-dev', ''), -+ - 'CURLINFO_APPCONNECT_TIME' => array('5.5.0-dev', ''), - 'CURLINFO_CERTINFO' => array('5.3.2', ''), - 'CURLINFO_CONDITION_UNMET' => array('5.5.0-dev', ''), -@@ -336,6 +341,7 @@ class PHP_CompatInfo_Reference_Curl - 'CURLMSG_DONE' => array('4.0.2', ''), - - 'CURLOPT_ACCEPT_ENCODING' => array('5.5.0-dev', ''), -+ 'CURLOPT_ACCEPTTIMEOUT_MS' => array('5.5.0-dev', ''), - 'CURLOPT_ADDRESS_SCOPE' => array('5.5.0-dev', ''), - 'CURLOPT_APPEND' => array('5.5.0-dev', ''), - 'CURLOPT_AUTOREFERER' => array('5.1.0', ''), -@@ -385,6 +391,7 @@ class PHP_CompatInfo_Reference_Curl - 'CURLOPT_FTP_USE_EPRT' => array('4.0.2', ''), - 'CURLOPT_FTP_USE_EPSV' => array('4.0.2', ''), - 'CURLOPT_FTP_USE_PRET' => array('5.5.0-dev', ''), -+ 'CURLOPT_GSSAPI_DELEGATION' => array('5.5.0-dev', ''), - 'CURLOPT_HEADER' => array('4.0.2', ''), - 'CURLOPT_HEADERFUNCTION' => array('4.0.2', ''), - 'CURLOPT_HTTP200ALIASES' => array('4.0.2', ''), -@@ -484,6 +491,7 @@ class PHP_CompatInfo_Reference_Curl - 'CURLOPT_SSL_VERIFYPEER' => array('4.0.2', ''), - 'CURLOPT_STDERR' => array('4.0.2', ''), - 'CURLOPT_TCP_NODELAY' => array('5.2.1', ''), -+ 'CURLOPT_TELNETOPTIONS' => array('5.5.0-dev', ''), - 'CURLOPT_TFTP_BLKSIZE' => array('5.5.0-dev', ''), - 'CURLOPT_TIMECONDITION' => array('4.0.2', ''), - 'CURLOPT_TIMEOUT' => array('4.0.2', ''), --- -1.7.11.7 - diff --git a/0017-data-reference-for-php-5.5-date-immutable.patch b/0017-data-reference-for-php-5.5-date-immutable.patch deleted file mode 100644 index 62654fb..0000000 --- a/0017-data-reference-for-php-5.5-date-immutable.patch +++ /dev/null @@ -1,34 +0,0 @@ -From bbcf29cd267f86f60ce04048f7afd137a7f7a8dd Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Thu, 17 Jan 2013 20:51:52 +0100 -Subject: [PATCH 17/17] data reference for php 5.5 (date immutable) - ---- - PHP/CompatInfo/Reference/date.php | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/PHP/CompatInfo/Reference/date.php b/PHP/CompatInfo/Reference/date.php -index 600789c..1e84586 100644 ---- a/PHP/CompatInfo/Reference/date.php -+++ b/PHP/CompatInfo/Reference/date.php -@@ -79,6 +79,7 @@ class PHP_CompatInfo_Reference_Date - 'DatePeriod' => array('5.3.0', ''), - 'DateTime' => array('5.2.0', ''), - 'DateTimeZone' => array('5.2.0', ''), -+ 'DateTimeImmutable' => array('5.5.0-dev', ''), - ); - $this->applyFilter($release, $items, $classes); - -@@ -110,6 +111,9 @@ class PHP_CompatInfo_Reference_Date - 'date_add' => array('5.3.0', ''), - 'date_create' => array('5.2.0', ''), - 'date_create_from_format' => array('5.3.0', ''), -+ 'date_create_immutable' => array('5.5.0-dev', ''), -+ 'date_create_immutable_from_format' -+ => array('5.5.0-dev', ''), - 'date_date_set' => array('5.2.0', ''), - 'date_default_timezone_get' => array('5.1.0', ''), - 'date_default_timezone_set' => array('5.1.0', ''), --- -1.7.11.7 - diff --git a/0018-new-curl-change-in-php-5.5.patch b/0018-new-curl-change-in-php-5.5.patch deleted file mode 100644 index ab5bd0a..0000000 --- a/0018-new-curl-change-in-php-5.5.patch +++ /dev/null @@ -1,75 +0,0 @@ -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/0019-new-filter-changes-in-php-5.5.patch b/0019-new-filter-changes-in-php-5.5.patch deleted file mode 100644 index 679daf0..0000000 --- a/0019-new-filter-changes-in-php-5.5.patch +++ /dev/null @@ -1,25 +0,0 @@ -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/0020-new-curl-changes-in-php-5.5.patch b/0020-new-curl-changes-in-php-5.5.patch deleted file mode 100644 index 9825dee..0000000 --- a/0020-new-curl-changes-in-php-5.5.patch +++ /dev/null @@ -1,82 +0,0 @@ -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/0021-new-intl-changes-in-php-5.5.patch b/0021-new-intl-changes-in-php-5.5.patch deleted file mode 100644 index b8d2f60..0000000 --- a/0021-new-intl-changes-in-php-5.5.patch +++ /dev/null @@ -1,24 +0,0 @@ -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/0022-fix-covers-annotation.patch b/0022-fix-covers-annotation.patch deleted file mode 100644 index 463147f..0000000 --- a/0022-fix-covers-annotation.patch +++ /dev/null @@ -1,25 +0,0 @@ -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/0023-fix-mysqli-reference-for-php-5.5-trans.patch b/0023-fix-mysqli-reference-for-php-5.5-trans.patch deleted file mode 100644 index b55c381..0000000 --- a/0023-fix-mysqli-reference-for-php-5.5-trans.patch +++ /dev/null @@ -1,53 +0,0 @@ -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/0024-fix-gd-reference-for-php-5.5.0alpha6.patch b/0024-fix-gd-reference-for-php-5.5.0alpha6.patch deleted file mode 100644 index 0af7d88..0000000 --- a/0024-fix-gd-reference-for-php-5.5.0alpha6.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 94a4f11cac43454ed26d37fb71b4eafc4de61bc6 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Sat, 9 Mar 2013 16:26:31 +0100 -Subject: [PATCH] fix gd reference for php 5.5.0alpha6 - ---- - PHP/CompatInfo/Reference/gd.php | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/PHP/CompatInfo/Reference/gd.php b/PHP/CompatInfo/Reference/gd.php -index 60e16f3..d10be0f 100644 ---- a/PHP/CompatInfo/Reference/gd.php -+++ b/PHP/CompatInfo/Reference/gd.php -@@ -118,6 +118,8 @@ class PHP_CompatInfo_Reference_Gd - 'imagecreatefromxpm' => array('4.0.1', ''), - 'imagecreatetruecolor' => array('4.0.6', ''), - 'imagecreatefromwebp' => array('5.4.0', ''), -+ 'imagecrop' => array('5.5.0-dev', ''), -+ 'imagecropauto' => array('5.5.0-dev', ''), - 'imagewebp' => array('5.4.0', ''), - 'imagedashedline' => array('4.0.0', ''), - 'imagedestroy' => array('4.0.0', ''), -@@ -129,6 +131,7 @@ class PHP_CompatInfo_Reference_Gd - 'imagefilledrectangle' => array('4.0.0', ''), - 'imagefilltoborder' => array('4.0.0', ''), - 'imagefilter' => array('5.0.0', ''), -+ 'imageflip' => array('5.5.0-dev', ''), - 'imagefontheight' => array('4.0.0', ''), - 'imagefontwidth' => array('4.0.0', ''), - 'imageftbbox' => array('4.0.7', ''), -@@ -217,6 +220,12 @@ class PHP_CompatInfo_Reference_Gd - 'IMG_COLOR_STYLEDBRUSHED' => array('4.0.0', ''), - 'IMG_COLOR_TILED' => array('4.0.0', ''), - 'IMG_COLOR_TRANSPARENT' => array('4.0.0', ''), -+ 'IMG_CROP_BLACK' => array('5.5.0-dev', ''), -+ 'IMG_CROP_DEFAULT' => array('5.5.0-dev', ''), -+ 'IMG_CROP_SIDES' => array('5.5.0-dev', ''), -+ 'IMG_CROP_TRANSPARENT' => array('5.5.0-dev', ''), -+ 'IMG_CROP_THRESHOLD' => array('5.5.0-dev', ''), -+ 'IMG_CROP_WHITE' => array('5.5.0-dev', ''), - 'IMG_EFFECT_ALPHABLEND' => array('4.0.0', ''), - 'IMG_EFFECT_NORMAL' => array('4.0.0', ''), - 'IMG_EFFECT_OVERLAY' => array('4.0.0', ''), -@@ -233,6 +242,9 @@ class PHP_CompatInfo_Reference_Gd - 'IMG_FILTER_PIXELATE' => array('5.3.0', ''), - 'IMG_FILTER_SELECTIVE_BLUR' => array('4.0.0', ''), - 'IMG_FILTER_SMOOTH' => array('4.0.0', ''), -+ 'IMG_FLIP_HORIZONTAL' => array('5.5.0-dev', ''), -+ 'IMG_FLIP_VERTICAL' => array('5.5.0-dev', ''), -+ 'IMG_FLIP_BOTH' => array('5.5.0-dev', ''), - 'IMG_GD2_COMPRESSED' => array('4.0.0', ''), - 'IMG_GD2_RAW' => array('4.0.0', ''), - 'IMG_GIF' => array('4.0.0', ''), --- -1.7.11.7 - diff --git a/0025-array_column.patch b/0025-array_column.patch deleted file mode 100644 index f7f5f6c..0000000 --- a/0025-array_column.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 77931f9c94a4cb639f62cf077ae7faaf701973a9 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Wed, 20 Mar 2013 14:45:23 +0100 -Subject: [PATCH] new 'array_column' function - ---- - PHP/CompatInfo/Reference/standard.php | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/PHP/CompatInfo/Reference/standard.php b/PHP/CompatInfo/Reference/standard.php -index 68cbc66..5762d01 100644 ---- a/PHP/CompatInfo/Reference/standard.php -+++ b/PHP/CompatInfo/Reference/standard.php -@@ -756,6 +756,7 @@ public function getFunctions($extension = null, $version = null, $condition = nu - 'password_hash' => array('5.5.0-dev', ''), - 'password_needs_rehash' => array('5.5.0-dev', ''), - 'password_verify' => array('5.5.0-dev', ''), -+ 'array_column' => array('5.5.0-dev', ''), - ); - $this->applyFilter($release, $items, $functions); - --- -1.8.1.5 - diff --git a/0026-fix-gd-reference-for-php-5.5.0beta2.patch b/0026-fix-gd-reference-for-php-5.5.0beta2.patch deleted file mode 100644 index 9b46cea..0000000 --- a/0026-fix-gd-reference-for-php-5.5.0beta2.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 7c4f30cbcaae602d81c9cff6adaa9b32f676955c Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Thu, 28 Mar 2013 13:05:00 +0100 -Subject: [PATCH] fix gd reference for php 5.5.0beta2 - ---- - PHP/CompatInfo/Reference/gd.php | 32 ++++++++++++++++++++++++++++++++ - 1 file changed, 32 insertions(+) - -diff --git a/PHP/CompatInfo/Reference/gd.php b/PHP/CompatInfo/Reference/gd.php -index d10be0f..1ddb29f 100644 ---- a/PHP/CompatInfo/Reference/gd.php -+++ b/PHP/CompatInfo/Reference/gd.php -@@ -78,6 +78,9 @@ public function getFunctions($extension = null, $version = null, $condition = nu - $items = array( - 'gd_info' => array('4.3.0', ''), - 'image2wbmp' => array('4.0.5', ''), -+ 'imageaffine' => array('5.5.0-dev', ''), -+ 'imageaffinematrixconcat' => array('5.5.0-dev', ''), -+ 'imageaffinematrixget' => array('5.5.0-dev', ''), - 'imagealphablending' => array('4.0.6', ''), - 'imageantialias' => array('4.3.2', ''), - 'imagearc' => array('4.0.0', ''), -@@ -149,6 +152,7 @@ public function getFunctions($extension = null, $version = null, $condition = nu - 'imageline' => array('4.0.0', ''), - 'imageloadfont' => array('4.0.0', ''), - 'imagepalettecopy' => array('4.0.1', ''), -+ 'imagepalettetotruecolor' => array('5.5.0-dev', ''), - 'imagepng' => array('4.0.0', ''), - 'imagepolygon' => array('4.0.0', ''), - 'imagepsbbox' => array('4.0.0', ''), -@@ -161,7 +165,9 @@ public function getFunctions($extension = null, $version = null, $condition = nu - 'imagerectangle' => array('4.0.0', ''), - 'imagerotate' => array('4.3.0', ''), - 'imagesavealpha' => array('4.3.2', ''), -+ 'imagescale' => array('5.5.0-dev', ''), - 'imagesetbrush' => array('4.0.6', ''), -+ 'imagesetinterpolation' => array('5.5.0-dev', ''), - 'imagesetpixel' => array('4.0.0', ''), - 'imagesetstyle' => array('4.0.6', ''), - 'imagesetthickness' => array('4.0.6', ''), -@@ -210,11 +216,25 @@ public function getConstants($extension = null, $version = null, $condition = nu - 'GD_MINOR_VERSION' => array('5.2.4', ''), - 'GD_RELEASE_VERSION' => array('5.2.4', ''), - 'GD_VERSION' => array('5.2.4', ''), -+ 'IMG_AFFINE_ROTATE' => array('5.5.0-dev', ''), -+ 'IMG_AFFINE_SCALE' => array('5.5.0-dev', ''), -+ 'IMG_AFFINE_SHEAR_HORIZONTAL' => array('5.5.0-dev', ''), -+ 'IMG_AFFINE_SHEAR_VERTICAL' => array('5.5.0-dev', ''), -+ 'IMG_AFFINE_TRANSLATE' => array('5.5.0-dev', ''), - 'IMG_ARC_CHORD' => array('4.0.0', ''), - 'IMG_ARC_EDGED' => array('4.0.0', ''), - 'IMG_ARC_NOFILL' => array('4.0.0', ''), - 'IMG_ARC_PIE' => array('4.0.0', ''), - 'IMG_ARC_ROUNDED' => array('4.0.0', ''), -+ 'IMG_BELL' => array('5.5.0-dev', ''), -+ 'IMG_BESSEL' => array('5.5.0-dev', ''), -+ 'IMG_BICUBIC' => array('5.5.0-dev', ''), -+ 'IMG_BICUBIC_FIXED' => array('5.5.0-dev', ''), -+ 'IMG_BILINEAR_FIXED' => array('5.5.0-dev', ''), -+ 'IMG_BLACKMAN' => array('5.5.0-dev', ''), -+ 'IMG_BOX' => array('5.5.0-dev', ''), -+ 'IMG_BSPLINE' => array('5.5.0-dev', ''), -+ 'IMG_CATMULLROM' => array('5.5.0-dev', ''), - 'IMG_COLOR_BRUSHED' => array('4.0.0', ''), - 'IMG_COLOR_STYLED' => array('4.0.0', ''), - 'IMG_COLOR_STYLEDBRUSHED' => array('4.0.0', ''), -@@ -245,13 +265,25 @@ public function getConstants($extension = null, $version = null, $condition = nu - 'IMG_FLIP_HORIZONTAL' => array('5.5.0-dev', ''), - 'IMG_FLIP_VERTICAL' => array('5.5.0-dev', ''), - 'IMG_FLIP_BOTH' => array('5.5.0-dev', ''), -+ 'IMG_GAUSSIAN' => array('5.5.0-dev', ''), -+ 'IMG_GENERALIZED_CUBIC' => array('5.5.0-dev', ''), - 'IMG_GD2_COMPRESSED' => array('4.0.0', ''), - 'IMG_GD2_RAW' => array('4.0.0', ''), - 'IMG_GIF' => array('4.0.0', ''), -+ 'IMG_HAMMING' => array('5.5.0-dev', ''), -+ 'IMG_HANNING' => array('5.5.0-dev', ''), -+ 'IMG_HERMITE' => array('5.5.0-dev', ''), - 'IMG_JPEG' => array('4.0.0', ''), - 'IMG_JPG' => array('4.0.0', ''), -+ 'IMG_MITCHELL' => array('5.5.0-dev', ''), -+ 'IMG_NEAREST_NEIGHBOUR' => array('5.5.0-dev', ''), - 'IMG_PNG' => array('4.0.0', ''), -+ 'IMG_POWER' => array('5.5.0-dev', ''), -+ 'IMG_QUADRATIC' => array('5.5.0-dev', ''), -+ 'IMG_SINC' => array('5.5.0-dev', ''), -+ 'IMG_TRIANGLE' => array('5.5.0-dev', ''), - 'IMG_WBMP' => array('4.0.0', ''), -+ 'IMG_WEIGHTED4' => array('5.5.0-dev', ''), - 'IMG_XPM' => array('4.0.0', ''), - 'PNG_ALL_FILTERS' => array('4.0.0', ''), - 'PNG_FILTER_AVG' => array('4.0.0', ''), --- -1.8.1.5 - diff --git a/0027-fix-curl-ref-for-latest-libcurl.patch b/0027-fix-curl-ref-for-latest-libcurl.patch deleted file mode 100644 index ae5d72d..0000000 --- a/0027-fix-curl-ref-for-latest-libcurl.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff --git a/PHP/CompatInfo/Reference/curl.php b/PHP/CompatInfo/Reference/curl.php -index cbfc2f0..507bea0 100644 ---- a/PHP/CompatInfo/Reference/curl.php -+++ b/PHP/CompatInfo/Reference/curl.php -@@ -416,6 +416,7 @@ class PHP_CompatInfo_Reference_Curl - 'CURLOPT_LOCALPORTRANGE' => array('5.5.0-dev', ''), - 'CURLOPT_LOW_SPEED_LIMIT' => array('4.0.2', ''), - 'CURLOPT_LOW_SPEED_TIME' => array('4.0.2', ''), -+ 'CURLOPT_MAIL_AUTH' => array('5.5.0-dev', ''), - 'CURLOPT_MAIL_FROM' => array('5.5.0-dev', ''), - 'CURLOPT_MAIL_RCPT' => array('5.5.0-dev', ''), - 'CURLOPT_MAXCONNECTS' => array('4.0.2', ''), -@@ -470,6 +471,7 @@ class PHP_CompatInfo_Reference_Curl - 'CURLOPT_RTSP_TRANSPORT' => array('5.5.0-dev', ''), - 'CURLOPT_SAFE_UPLOAD' => array('5.5.0-dev', ''), - 'CURLOPT_SHARE' => array('5.5.0-dev', ''), -+ 'CURLOPT_SSL_OPTIONS' => array('5.5.0-dev', ''), - 'CURLOPT_SOCKS5_GSSAPI_NEC' => array('5.5.0-dev', ''), - 'CURLOPT_SOCKS5_GSSAPI_SERVICE' => array('5.5.0-dev', ''), - 'CURLOPT_SSH_AUTH_TYPES' => array('5.3.0', ''), -@@ -492,6 +494,9 @@ class PHP_CompatInfo_Reference_Curl - 'CURLOPT_SSL_VERIFYHOST' => array('4.0.2', ''), - 'CURLOPT_SSL_VERIFYPEER' => array('4.0.2', ''), - 'CURLOPT_STDERR' => array('4.0.2', ''), -+ 'CURLOPT_TCP_KEEPALIVE' => array('5.5.0-dev', ''), -+ 'CURLOPT_TCP_KEEPIDLE' => array('5.5.0-dev', ''), -+ 'CURLOPT_TCP_KEEPINTVL' => array('5.5.0-dev', ''), - 'CURLOPT_TCP_NODELAY' => array('5.2.1', ''), - 'CURLOPT_TELNETOPTIONS' => array('5.5.0-dev', ''), - 'CURLOPT_TFTP_BLKSIZE' => array('5.5.0-dev', ''), -@@ -567,6 +572,8 @@ class PHP_CompatInfo_Reference_Curl - 'CURLSSH_AUTH_PASSWORD' => array('5.3.0', ''), - 'CURLSSH_AUTH_PUBLICKEY' => array('5.3.0', ''), - -+ 'CURLSSLOPT_ALLOW_BEAST' => array('5.5.0-dev', ''), -+ - 'CURLUSESSL_ALL' => array('5.5.0-dev', ''), - 'CURLUSESSL_CONTROL' => array('5.5.0-dev', ''), - 'CURLUSESSL_NONE' => array('5.5.0-dev', ''), -diff --git a/tests/Reference/CurlTest.php b/tests/Reference/CurlTest.php -index 667e562..05acc5e 100644 ---- a/tests/Reference/CurlTest.php -+++ b/tests/Reference/CurlTest.php -@@ -121,7 +121,73 @@ class PHP_CompatInfo_Reference_CurlTest - $this->optionalconstants, - 'CURLINFO_LOCAL_IP', - 'CURLINFO_LOCAL_PORT', -- 'CURLINFO_PRIMARY_PORT' -+ 'CURLINFO_PRIMARY_PORT', -+ 'CURLOPT_FNMATCH_FUNCTION', -+ 'CURLOPT_WILDCARDMATCH', -+ 'CURLPROTO_RTMP', -+ 'CURLPROTO_RTMPE', -+ 'CURLPROTO_RTMPS', -+ 'CURLPROTO_RTMPT', -+ 'CURLPROTO_RTMPTE', -+ 'CURLPROTO_RTMPTS', -+ 'CURL_FNMATCHFUNC_FAIL', -+ 'CURL_FNMATCHFUNC_MATCH', -+ 'CURL_FNMATCHFUNC_NOMATCH' -+ ); -+ } -+ if ($ver<0x071502) { /* Available since 7.21.2 */ -+ array_push( -+ $this->optionalconstants, -+ 'CURLPROTO_GOPHER' -+ ); -+ } -+ if ($ver<0x071503) { /* Available since 7.21.3 */ -+ array_push( -+ $this->optionalconstants, -+ 'CURLAUTH_ONLY', -+ 'CURLOPT_RESOLVE' -+ ); -+ } -+ if ($ver<0x071504) { /* Available since 7.21.4 */ -+ array_push( -+ $this->optionalconstants, -+ 'CURLOPT_TLSAUTH_PASSWORD', -+ 'CURLOPT_TLSAUTH_TYPE', -+ 'CURLOPT_TLSAUTH_USERNAME', -+ 'CURL_TLSAUTH_SRP' -+ ); -+ } -+ if ($ver<0x071506) { /* Available since 7.21.6 */ -+ array_push( -+ $this->optionalconstants, -+ 'CURLOPT_ACCEPT_ENCODING', -+ 'CURLOPT_TRANSFER_ENCODING' -+ ); -+ } -+ if ($ver<0x071600) { /* Available since 7.22.0 */ -+ array_push( -+ $this->optionalconstants, -+ 'CURLGSSAPI_DELEGATION_FLAG', -+ 'CURLGSSAPI_DELEGATION_POLICY_FLAG', -+ 'CURLOPT_GSSAPI_DELEGATION' -+ ); -+ } -+ if ($ver<0x071800) { /* Available since 7.24.0 */ -+ array_push( -+ $this->optionalconstants, -+ 'CURLOPT_ACCEPTTIMEOUT_MS', -+ 'CURLOPT_DNS_SERVERS' -+ ); -+ } -+ if ($ver<0x071900) { /* Available since 7.25.0 */ -+ array_push( -+ $this->optionalconstants, -+ 'CURLOPT_MAIL_AUTH', -+ 'CURLOPT_SSL_OPTIONS', -+ 'CURLOPT_TCP_KEEPALIVE', -+ 'CURLOPT_TCP_KEEPIDLE', -+ 'CURLOPT_TCP_KEEPINTVL', -+ 'CURLSSLOPT_ALLOW_BEAST' - ); - } - } diff --git a/0028-fix-reference-for-datetimeinterface.patch b/0028-fix-reference-for-datetimeinterface.patch deleted file mode 100644 index 5d4ec07..0000000 --- a/0028-fix-reference-for-datetimeinterface.patch +++ /dev/null @@ -1,49 +0,0 @@ -From c85563b06140afa310a8208a5695f9ad2d3a312b Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Thu, 4 Apr 2013 11:13:05 +0200 -Subject: [PATCH] fix data ref for php 5.5 (DateTimeInterface) - ---- - PHP/CompatInfo/Reference/date.php | 26 ++++++++++++++++++++++++++ - 1 file changed, 26 insertions(+) - -diff --git a/PHP/CompatInfo/Reference/date.php b/PHP/CompatInfo/Reference/date.php -index 1e84586..f141613 100644 ---- a/PHP/CompatInfo/Reference/date.php -+++ b/PHP/CompatInfo/Reference/date.php -@@ -87,6 +87,32 @@ public function getClasses($extension = null, $version = null, $condition = null - } - - /** -+ * Gets informations about interfaces -+ * -+ * @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 getInterfaces($extension = null, $version = null, $condition = null) -+ { -+ $this->setFilter(func_get_args()); -+ -+ $interfaces = array(); -+ -+ $release = '5.5.0'; // not yet -+ $items = array( -+ 'DateTimeInterface' => array('5.5.0-dev', ''), -+ ); -+ $this->applyFilter($release, $items, $interfaces); -+ -+ return $interfaces; -+ } -+ -+ /** - * Gets informations about functions - * - * @param string $extension (optional) NULL for PHP version, --- -1.8.1.5 - diff --git a/0031-fix-opcache-reference-php550beta3.patch b/0031-fix-opcache-reference-php550beta3.patch deleted file mode 100644 index e6f14c2..0000000 --- a/0031-fix-opcache-reference-php550beta3.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b84b0440e26be71b2f9bd6ab547859add813a236 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Fri, 12 Apr 2013 08:57:25 +0200 -Subject: [PATCH] add opcache_invalidate (7.0.2-dev, or PHP 5.5.0beta3) - ---- - PHP/CompatInfo/Reference/zendopcache.php | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/PHP/CompatInfo/Reference/zendopcache.php b/PHP/CompatInfo/Reference/zendopcache.php -index c488024..a326bdf 100644 ---- a/PHP/CompatInfo/Reference/zendopcache.php -+++ b/PHP/CompatInfo/Reference/zendopcache.php -@@ -85,6 +85,12 @@ public function getFunctions($extension = null, $version = null, $condition = nu - ); - $this->applyFilter($release, $items, $functions); - -+ $release = '7.0.2'; // not yet -+ $items = array( -+ 'opcache_invalidate' => array('5.2.0', ''), -+ ); -+ $this->applyFilter($release, $items, $functions); -+ - return $functions; - } - } --- -1.8.1.5 - diff --git a/0032-new-soap-constants.patch b/0032-new-soap-constants.patch deleted file mode 100644 index 59b3385..0000000 --- a/0032-new-soap-constants.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8df8c44ed7d416709e9c1aa1277b075216cde4be Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Fri, 10 May 2013 11:19:28 +0200 -Subject: [PATCH] new SOAP_SSL_METHOD_* in php 5.5.0RC1 - ---- - PHP/CompatInfo/Reference/soap.php | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/PHP/CompatInfo/Reference/soap.php b/PHP/CompatInfo/Reference/soap.php -index 3c7d4c0..bd342a6 100644 ---- a/PHP/CompatInfo/Reference/soap.php -+++ b/PHP/CompatInfo/Reference/soap.php -@@ -154,6 +154,10 @@ public function getConstants($extension = null, $version = null, $condition = nu - 'SOAP_ENC_OBJECT' => array('5.0.0', ''), - 'SOAP_FUNCTIONS_ALL' => array('5.0.0', ''), - 'SOAP_LITERAL' => array('5.0.0', ''), -+ 'SOAP_SSL_METHOD_TLS' => array('5.5.0-dev', ''), -+ 'SOAP_SSL_METHOD_SSLv2' => array('5.5.0-dev', ''), -+ 'SOAP_SSL_METHOD_SSLv23' => array('5.5.0-dev', ''), -+ 'SOAP_SSL_METHOD_SSLv3' => array('5.5.0-dev', ''), - 'SOAP_PERSISTENCE_REQUEST' => array('5.0.0', ''), - 'SOAP_PERSISTENCE_SESSION' => array('5.0.0', ''), - 'SOAP_RPC' => array('5.0.0', ''), --- -1.8.1.6 - diff --git a/PHP_CompatInfo-ref.patch b/PHP_CompatInfo-ref.patch new file mode 100644 index 0000000..1dcd7bd --- /dev/null +++ b/PHP_CompatInfo-ref.patch @@ -0,0 +1,54 @@ +From acec87ba0681ddeda4fe32acb42e1b4e5ff84caa Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Wed, 26 Jun 2013 11:07:34 +0200 +Subject: [PATCH] windows only constants (from + ext/sockets/win32_socket_constants.h) + +--- + tests/Reference/SocketsTest.php | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/tests/Reference/SocketsTest.php b/tests/Reference/SocketsTest.php +index 8e27c70..f652153 100644 +--- a/tests/Reference/SocketsTest.php ++++ b/tests/Reference/SocketsTest.php +@@ -73,6 +73,7 @@ protected function setUp() + 'SOCKET_EBUSY', + 'SOCKET_ECHRNG', + 'SOCKET_ECOMM', ++ 'SOCKET_EDISCON', + 'SOCKET_EEXIST', + 'SOCKET_EIDRM', + 'SOCKET_EIO', +@@ -109,6 +110,7 @@ protected function setUp() + 'SOCKET_ENXIO', + 'SOCKET_EPERM', + 'SOCKET_EPIPE', ++ 'SOCKET_EPROCLIM', + 'SOCKET_EPROTO', + 'SOCKET_EREMCHG', + 'SOCKET_EREMOTEIO', +@@ -116,11 +118,20 @@ protected function setUp() + 'SOCKET_EROFS', + 'SOCKET_ESPIPE', + 'SOCKET_ESRMNT', ++ 'SOCKET_ESTALE', + 'SOCKET_ESTRPIPE', + 'SOCKET_ETIME', + 'SOCKET_EUNATCH', + 'SOCKET_EXDEV', + 'SOCKET_EXFULL', ++ 'SOCKET_HOST_NOT_FOUND', ++ 'SOCKET_NO_ADDRESS', ++ 'SOCKET_NO_DATA', ++ 'SOCKET_NO_RECOVERY', ++ 'SOCKET_NOTINITIALISED', ++ 'SOCKET_SYSNOTREADY', ++ 'SOCKET_TRY_AGAIN', ++ 'SOCKET_VERNOTSUPPORTED', + 'MSG_DONTWAIT', + 'MSG_EOR', + 'MSG_EOF', +-- +1.8.1.6 + diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 1370592..9fe709f 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -15,8 +15,8 @@ Name: php-bartlett-PHP-CompatInfo -Version: 2.17.0 -Release: 2%{?dist} +Version: 2.18.0 +Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run Group: Development/Libraries @@ -31,35 +31,8 @@ Source1: https://raw.github.com/llaville/php-compat-info/master/misc/phpc # Make cache / save_path user specific Patch0: %{pear_name}-conf.patch -# Update reference for PHP 5.5 -# https://github.com/llaville/php-compat-info/commits/php-5.5 -Patch1: 0001-cuirl-reference-for-php-5.5.patch -Patch2: 0002-hash-reference-for-php-5.5.patch -Patch3: 0003-tokoniser-reference-for-php-5.5.patch -Patch4: 0004-standard-reference-for-php-5.5.patch -Patch6: 0006-openssl-reference-for-php-5.5.patch -Patch7: 0007-mysqli-reference-for-php-5.5.patch -Patch8: 0008-Fix-json-reference-for-PHP-5.5.patch -Patch9: 0009-Fix-intl-reference-for-PHP-5.5.patch -Patch10: 0010-fix-Core-reference-for-PHP-5.5.patch -Patch11: 0011-fix-order-in-intl.patch -Patch12: 0012-curl-reference-for-php-5.5-more.patch -Patch13: 0013-use-LATEST_PHP_5_4-macro.patch -Patch14: 0014-curl-reference-for-php-5.5-more.patch -Patch17: 0017-data-reference-for-php-5.5-date-immutable.patch -Patch18: 0018-new-curl-change-in-php-5.5.patch -Patch19: 0019-new-filter-changes-in-php-5.5.patch -Patch20: 0020-new-curl-changes-in-php-5.5.patch -Patch21: 0021-new-intl-changes-in-php-5.5.patch -Patch22: 0022-fix-covers-annotation.patch -Patch23: 0023-fix-mysqli-reference-for-php-5.5-trans.patch -Patch24: 0024-fix-gd-reference-for-php-5.5.0alpha6.patch -Patch25: 0025-array_column.patch -Patch26: 0026-fix-gd-reference-for-php-5.5.0beta2.patch -Patch27: 0027-fix-curl-ref-for-latest-libcurl.patch -Patch28: 0028-fix-reference-for-datetimeinterface.patch -Patch31: 0031-fix-opcache-reference-php550beta3.patch -Patch32: 0032-new-soap-constants.patch +# https://github.com/llaville/php-compat-info/pull/94 +Patch1: %{pear_name}-ref.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -68,7 +41,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.6.2 +BuildRequires: php-pear(%{channel}/PHP_Reflect) >= 1.7.0 Requires(post): %{__pear} Requires(postun): %{__pear} @@ -80,7 +53,7 @@ Requires: php-pcre Requires: php-reflection Requires: php-spl Requires: php-pear(PEAR) >= 1.9.0 -Requires: php-pear(%{channel}/PHP_Reflect) >= 1.6.2 +Requires: php-pear(%{channel}/PHP_Reflect) >= 1.7.0 Requires: php-pear(Console_CommandLine) >= 1.2.0 # Optional Requires: php-pear(pear.phpunit.de/PHPUnit) >= 3.6.0 @@ -100,13 +73,10 @@ show content of dictionary references. HTML Documentation: %{pear_docdir}/%{pear_name}/html/index.html -This package provides experimental references for PHP 5.5. - %prep %setup -q -c -# Package is V2 cd %{pear_name}-%{version}%{?prever} # Copy upstream default configuration @@ -114,37 +84,10 @@ cp phpcompatinfo.xml.dist phpcompatinfo.xml # Apply our changes %patch0 -p1 -b .rpm -# PHP 5.5 updated references -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch31 -p1 -%patch32 -p1 +%patch1 -p1 -b .ref # remove checksum for patched files -sed -e 's/md5sum.*name/name/' \ +sed -e '/SocketsTest/s/md5sum.*name/name/' \ ../package.xml >%{name}.xml @@ -186,10 +129,10 @@ cd %{pear_name}-%{version}%{?prever} rm -f tests/Reference/XslTest.php %endif -# Tests: 654, Assertions: 9682, Skipped: 28, when most extensions installed # OK, but incomplete or skipped tests! -# Tests: 462, Assertions: 5936, Skipped: 254, in mock -# Reference tests need some fixes for EL-4, so ignore result for now +# Tests: 816, Assertions: 11365, Skipped: 72, when most extensions installed +# Tests: 550, Assertions: 6834, Skipped: 378, in mock +# Reference tests need some fixes for EL-5, so ignore result for now %{_bindir}/phpunit \ -d date.timezone=UTC \ -d memory_limit=-1 \ @@ -230,6 +173,12 @@ fi %changelog +* Wed Jun 26 2013 Remi Collet <remi@fedoraproject.org> - 2.18.0-1 +- Update to 2.18.0 +- raise dependencies, PHP_Reflect 1.7.0 +- drop PHP 5.5 patches, applied upstream +- add patch for windows only constants + * Fri Jun 07 2013 Remi Collet <remi@fedoraproject.org> - 2.17.0-2 - keep phpci command for now |