php-bartlett-PHP-CompatInfo: 2.19.0

4 files changed, 104 insertions, 61 deletions

diff --git a/PHP_CompatInfo-conf.patch b/PHP_CompatInfo-conf.patch
index a66a4a8..2aa82ae 100644
--- a/PHP_CompatInfo-conf.patch
+++ b/PHP_CompatInfo-conf.patch
@@ -1,6 +1,14 @@
---- PHP_CompatInfo-2.14.1/phpcompatinfo.xml.dist	2013-04-01 18:17:03.000000000 +0200
-+++ PHP_CompatInfo-2.14.1/phpcompatinfo.xml	2013-04-02 10:15:27.000000000 +0200
-@@ -12,6 +12,7 @@
+--- PHP_CompatInfo-2.19.0/phpcompatinfo.xml.dist	2013-07-11 22:21:27.000000000 +0200
++++ PHP_CompatInfo-2.19.0/phpcompatinfo.xml	2013-07-12 08:22:34.529605184 +0200
+@@ -5,13 +5,14 @@
+     reportFileAppend="false"
+     cacheDriver="file"
+     recursive="false"
+-    fileExtensions="php, inc, phtml"
++    fileExtensions="php, inc, phtml, module, install"
+     consoleProgress="true"
+     verbose="false"
+     >
  
      <cache id="file">
          <options>
diff --git a/PHP_CompatInfo-intl.patch b/PHP_CompatInfo-intl.patch
new file mode 100644
index 0000000..73abe74
--- /dev/null
+++ b/PHP_CompatInfo-intl.patch
@@ -0,0 +1,83 @@
+diff --git a/PHP/CompatInfo/Reference/intl.php b/PHP/CompatInfo/Reference/intl.php
+index 64a088f..6266150 100644
+--- a/PHP/CompatInfo/Reference/intl.php
++++ b/PHP/CompatInfo/Reference/intl.php
+@@ -342,6 +342,10 @@ class PHP_CompatInfo_Reference_Intl
+                                                 => array('5.5.0', ''),
+             'intlcal_get_minimum'               => array('5.5.0', ''),
+             'intlcal_get_now'                   => array('5.5.0', ''),
++            'intlcal_get_repeated_wall_time_option'
++                                                => array('5.5.0', ''),
++            'intlcal_get_skipped_wall_time_option'
++                                                => array('5.5.0', ''),
+             'intlcal_get_time'                  => array('5.5.0', ''),
+             'intlcal_get_time_zone'             => array('5.5.0', ''),
+             'intlcal_get_type'                  => array('5.5.0', ''),
+@@ -355,6 +359,10 @@ class PHP_CompatInfo_Reference_Intl
+             'intlcal_set'                       => array('5.5.0', ''),
+             'intlcal_set_first_day_of_week'     => array('5.5.0', ''),
+             'intlcal_set_lenient'               => array('5.5.0', ''),
++            'intlcal_set_repeated_wall_time_option'
++                                                => array('5.5.0', ''),
++            'intlcal_set_skipped_wall_time_option'
++                                                => array('5.5.0', ''),
+             'intlcal_set_time'                  => array('5.5.0', ''),
+             'intlcal_set_time_zone'             => array('5.5.0', ''),
+             'intlcal_to_date_time'              => array('5.5.0', ''),
+@@ -377,6 +385,7 @@ class PHP_CompatInfo_Reference_Intl
+             'intltz_get_offset'                 => array('5.5.0', ''),
+             'intltz_get_raw_offset'             => array('5.5.0', ''),
+             'intltz_get_region'                 => array('5.5.0', ''),
++            'intltz_get_unknown'                => array('5.5.0', ''),
+             'intltz_get_tz_data_version'        => array('5.5.0', ''),
+             'intltz_has_same_rules'             => array('5.5.0', ''),
+             'intltz_to_date_time_zone'          => array('5.5.0', ''),
+diff --git a/tests/Reference/IntlTest.php b/tests/Reference/IntlTest.php
+index 8636f4f..22c1717 100644
+--- a/tests/Reference/IntlTest.php
++++ b/tests/Reference/IntlTest.php
+@@ -51,13 +51,6 @@ class PHP_CompatInfo_Reference_IntlTest
+         if (PATH_SEPARATOR == ';') {
+             // Win*
+             $this->optionalclasses  = array('IntlException');
+-            $this->ignoredfunctions = array(
+-                'intltz_get_unknown',
+-                'intlcal_get_repeated_wall_time_option',
+-                'intlcal_get_skipped_wall_time_option',
+-                'intlcal_set_repeated_wall_time_option',
+-                'intlcal_set_skipped_wall_time_option',
+-            );
+         }
+ 
+         if (version_compare(INTL_ICU_VERSION, '3.8.0', 'lt')) {
+@@ -70,6 +63,30 @@ class PHP_CompatInfo_Reference_IntlTest
+             );
+         }
+ 
++        if (version_compare(INTL_ICU_VERSION, '4.8', 'lt')) {
++            // requires libicu >= 4.8
++            $this->optionalfunctions = array_merge(
++                $this->optionalfunctions,
++                array(
++                    'intltz_create_time_zone_id_enumeration',
++                    'intltz_get_region',
++                )
++            );
++        }
++        if (version_compare(INTL_ICU_VERSION, '49', 'lt')) {
++            // requires libicu >= 49 (version scheme change 4.9 become 49)
++            $this->optionalfunctions = array_merge(
++                $this->optionalfunctions,
++                array(
++                    'intltz_get_unknown',
++                    'intlcal_get_repeated_wall_time_option',
++                    'intlcal_get_skipped_wall_time_option',
++                    'intlcal_set_repeated_wall_time_option',
++                    'intlcal_set_skipped_wall_time_option',
++                )
++            );
++        }
++
+         /*
+             On Windows platform extension intl 1.1.0 :
+                 - uses libicu 4.6.1   for PHP 5.4.1 or greater
diff --git a/PHP_CompatInfo-ref.patch b/PHP_CompatInfo-ref.patch
deleted file mode 100644
index 1dcd7bd..0000000
--- a/PHP_CompatInfo-ref.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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 9fe709f..a5ae061 100644
--- a/php-bartlett-PHP-CompatInfo.spec
+++ b/php-bartlett-PHP-CompatInfo.spec
@@ -15,7 +15,7 @@
 
 
 Name:           php-bartlett-PHP-CompatInfo
-Version:        2.18.0
+Version:        2.19.0
 Release:        1%{?dist}
 Summary:        Find out version and the extensions required for a piece of code to run
 
@@ -29,10 +29,10 @@ Source1:        https://raw.github.com/llaville/php-compat-info/master/misc/phpc
 # Update configuration for best experience
 # Reference = ALL known extension (instead of installed ones)
 # Make cache / save_path user specific
+# Add .install .module to fileExtensions (for drupal)
 Patch0:         %{pear_name}-conf.patch
 
-# https://github.com/llaville/php-compat-info/pull/94
-Patch1:         %{pear_name}-ref.patch
+Patch1:         %{pear_name}-intl.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -87,7 +87,8 @@ cp phpcompatinfo.xml.dist phpcompatinfo.xml
 %patch1 -p1 -b .ref
 
 # remove checksum for patched files
-sed -e '/SocketsTest/s/md5sum.*name/name/' \
+sed -e '/intl.php/s/md5sum.*name/name/' \
+    -e '/IntlTest.php/s/md5sum.*name/name/' \
     ../package.xml >%{name}.xml
 
 
@@ -173,6 +174,11 @@ fi
 
 
 %changelog
+* Fri Jul 12 2013 Remi Collet <remi@fedoraproject.org> - 2.19.0-1
+- Update to 2.19.0
+- add module and install to fileExtensions in default configuration
+  for drupal packages, #979830
+
 * 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