v1.0.0

3 files changed, 32 insertions, 53 deletions

diff --git a/5ba2256141c7f724920bde9eddfd4f666c309d61.patch b/5ba2256141c7f724920bde9eddfd4f666c309d61.patch
deleted file mode 100644
index 00ce016..0000000
--- a/5ba2256141c7f724920bde9eddfd4f666c309d61.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5ba2256141c7f724920bde9eddfd4f666c309d61 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Sat, 24 Jun 2017 07:44:35 +0200
-Subject: [PATCH] Fix for PHP 7.2
-
-ZEND_ACC_CLONE have been removed in 7.2
-but was not used in previous version (7.0, 7.1)
----
- druid.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/druid.c b/druid.c
-index 1faf4c9..1c415f9 100644
---- a/druid.c
-+++ b/druid.c
-@@ -137,7 +137,7 @@ ZEND_END_ARG_INFO()
- const zend_function_entry druid_methods[] =
- {
-     PHP_ME(DRUID_NAME, __construct,             druid_void_arginfo, ZEND_ACC_CTOR|ZEND_ACC_PRIVATE)
--    PHP_ME(DRUID_NAME, __clone,                 NULL, ZEND_ACC_CLONE|ZEND_ACC_PRIVATE)
-+    PHP_ME(DRUID_NAME, __clone,                 NULL, ZEND_ACC_PRIVATE)
-     PHP_ME(DRUID_NAME, __sleep,                 NULL, ZEND_ACC_PRIVATE)
-     PHP_ME(DRUID_NAME, __wakeup,                NULL, ZEND_ACC_PRIVATE)
-     PHP_ME(DRUID_NAME, __destruct,              NULL, ZEND_ACC_PUBLIC | ZEND_ACC_DTOR)
diff --git a/REFLECTION b/REFLECTION
index ef9e451..7177f84 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,7 +1,6 @@
-Extension [ <persistent> extension #157 Druid version 0.9.2 ] {
+Extension [ <persistent> extension #183 Druid version 1.0.0 ] {
 
   - Dependencies {
-    Dependency [ curl (Required) ]
     Dependency [ json (Required) ]
   }
 
@@ -35,9 +34,10 @@ Extension [ <persistent> extension #157 Druid version 0.9.2 ] {
   - Classes [1] {
     Class [ <internal:Druid> class Druid ] {
 
-      - Constants [2] {
-        Constant [ string DRUID_CONTENT_TYPE ] { Content-Type:application/json }
-        Constant [ string DRUID_INSTANCE_DEFAULT ] { default }
+      - Constants [3] {
+        Constant [ public string DRUID_VERSION ] { 1.0.0 }
+        Constant [ public string DRUID_CONTENT_TYPE ] { Content-Type:application/json }
+        Constant [ public string DRUID_INSTANCE_DEFAULT ] { default }
       }
 
       - Static properties [1] {
@@ -53,7 +53,8 @@ Extension [ <persistent> extension #157 Druid version 0.9.2 ] {
         }
       }
 
-      - Properties [7] {
+      - Properties [8] {
+        Property [ <default> protected $debug ]
         Property [ <default> protected $tpl_path ]
         Property [ <default> protected $response_debug_info ]
         Property [ <default> protected $response_code ]
@@ -63,7 +64,7 @@ Extension [ <persistent> extension #157 Druid version 0.9.2 ] {
         Property [ <default> protected $host_rand ]
       }
 
-      - Methods [11] {
+      - Methods [14] {
         Method [ <internal:Druid, ctor> private method __construct ] {
 
           - Parameters [0] {
@@ -89,6 +90,9 @@ Extension [ <persistent> extension #157 Druid version 0.9.2 ] {
           }
         }
 
+        Method [ <internal:Druid> public method getDebugWitch ] {
+        }
+
         Method [ <internal:Druid> public method setDruidHosts ] {
 
           - Parameters [1] {
@@ -96,6 +100,9 @@ Extension [ <persistent> extension #157 Druid version 0.9.2 ] {
           }
         }
 
+        Method [ <internal:Druid> public method getDruidHosts ] {
+        }
+
         Method [ <internal:Druid> public method setTplPath ] {
 
           - Parameters [1] {
@@ -103,6 +110,9 @@ Extension [ <persistent> extension #157 Druid version 0.9.2 ] {
           }
         }
 
+        Method [ <internal:Druid> public method getTplPath ] {
+        }
+
         Method [ <internal:Druid> public method getData ] {
 
           - Parameters [2] {
diff --git a/php-pecl-druid.spec b/php-pecl-druid.spec
index 4f49955..28ff977 100644
--- a/php-pecl-druid.spec
+++ b/php-pecl-druid.spec
@@ -1,11 +1,15 @@
 # remirepo spec file for php-pecl-druid
 #
-# Copyright (c) 2016-2017 Remi Collet
+# Copyright (c) 2016-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
+
+# we don't want -z defs linker flag
+%undefine _strict_symbol_defs_build
+
 %if 0%{?scl:1}
 %global sub_prefix %{scl_prefix}
 %scl_package       php-pecl-druid
@@ -15,34 +19,30 @@
 %global pecl_name druid
 %global proj_name Druid
 %if "%{php_version}" < "5.6"
-# After json.ini and curl.ini
+# After json.ini
 %global ini_name  z-%{pecl_name}.ini
 %else
-# After 40-json.ini, 20-curl.ini
+# After 40-json.ini
 %global ini_name  50-%{pecl_name}.ini
 %endif
 
 Summary:        A Druid driver for PHP
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-Version:        0.9.2
-Release:        3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:        1.0.0
+Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        ASL 2.0
-Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{proj_name}
 Source0:        http://pecl.php.net/get/%{proj_name}-%{version}.tgz
 
-Patch0:         5ba2256141c7f724920bde9eddfd4f666c309d61.patch
-
+BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel
 BuildRequires:  %{?scl_prefix}php-pear
 BuildRequires:  %{?scl_prefix}php-json
-BuildRequires:  %{?scl_prefix}php-curl
 BuildRequires:  curl-devel
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
 Requires:       %{?scl_prefix}php-json%{?_isa}
-Requires:       %{?scl_prefix}php-curl%{?_isa}
 %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
 
 Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
@@ -55,15 +55,6 @@ Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{rele
 %endif
 
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-Obsoletes:     php53-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php53u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php54-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php54w-pecl-%{pecl_name} <= %{version}
-%if "%{php_version}" > "5.5"
-Obsoletes:     php55u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
-%endif
 %if "%{php_version}" > "5.6"
 Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
@@ -107,7 +98,6 @@ sed -e 's/role="test"/role="src"/' \
 mv %{proj_name}-%{version} NTS
 
 cd NTS
-%patch0 -p1 -b .pr8
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_DRUID_VERSION/{s/.* "//;s/".*$//;p}' php_druid.h)
@@ -186,7 +176,7 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
 
 
-%if 0%{?fedora} < 24
+%if 0%{?fedora} < 24 && 0%{?rhel} < 8
 # when pear installed alone, after us
 %triggerin -- %{?scl_prefix}php-pear
 if [ -x %{__pecl} ] ; then
@@ -208,7 +198,7 @@ fi
 
 %check
 cd NTS
-OPT="-n -d extension=json.so -d extension=curl.so"
+OPT="-n -d extension=json.so"
 
 # Minimal load test for NTS extension
 %{__php} $OPT \
@@ -239,6 +229,9 @@ cd ../ZTS
 
 
 %changelog
+* Wed May  2 2018 Remi Collet <remi@remirepo.net> - 1.0.0-1
+- update to 1.0.0
+
 * Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 0.9.2-3
 - rebuild for PHP 7.2.0beta1 new API