update to 2.1.2HEADmaster

4 files changed, 31 insertions, 50 deletions

diff --git a/PHPINFO b/PHPINFO
index d6b0184..3f35709 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
 gearman
 
 gearman support => enabled
-extension version => 2.1.0
-libgearman version => 1.1.19.1
+extension version => 2.1.2
+libgearman version => 1.1.20
 Default TCP Host => localhost
 Default TCP Port => 4730
diff --git a/REFLECTION b/REFLECTION
index c5c6f15..49efe03 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
+Extension [ <persistent> extension #72 gearman version 2.1.2 ] {
 
   - Constants [157] {
     Constant [ string GEARMAN_DEFAULT_TCP_HOST ] { localhost }
@@ -819,18 +819,20 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
     }
     Function [ <internal:gearman> function gearman_worker_add_server ] {
 
-      - Parameters [3] {
+      - Parameters [4] {
         Parameter #0 [ <required> GearmanWorker $obj ]
         Parameter #1 [ <optional> string $host = null ]
         Parameter #2 [ <optional> int $port = 0 ]
+        Parameter #3 [ <optional> bool $setupExceptionHandler = true ]
       }
       - Return [ bool ]
     }
     Function [ <internal:gearman> function gearman_worker_add_servers ] {
 
-      - Parameters [2] {
+      - Parameters [3] {
         Parameter #0 [ <required> GearmanWorker $obj ]
         Parameter #1 [ <optional> string $servers = null ]
+        Parameter #2 [ <optional> bool $setupExceptionHandler = true ]
       }
       - Return [ bool ]
     }
@@ -898,6 +900,13 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
       }
       - Return [ bool ]
     }
+    Function [ <internal:gearman> function gearman_worker_enable_exception_handler ] {
+
+      - Parameters [1] {
+        Parameter #0 [ <required> GearmanWorker $obj ]
+      }
+      - Return [ bool ]
+    }
   }
 
   - Classes [5] {
@@ -1419,7 +1428,7 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
       - Properties [0] {
       }
 
-      - Methods [22] {
+      - Methods [23] {
         Method [ <internal:gearman, ctor> public method __construct ] {
 
           - Parameters [0] {
@@ -1509,17 +1518,19 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
 
         Method [ <internal:gearman> public method addServer ] {
 
-          - Parameters [2] {
+          - Parameters [3] {
             Parameter #0 [ <optional> string $host = null ]
             Parameter #1 [ <optional> int $port = 0 ]
+            Parameter #2 [ <optional> bool $setupExceptionHandler = true ]
           }
           - Return [ bool ]
         }
 
         Method [ <internal:gearman> public method addServers ] {
 
-          - Parameters [1] {
+          - Parameters [2] {
             Parameter #0 [ <optional> string $servers = null ]
+            Parameter #1 [ <optional> bool $setupExceptionHandler = true ]
           }
           - Return [ bool ]
         }
@@ -1587,6 +1598,13 @@ Extension [ <persistent> extension #124 gearman version 2.1.0 ] {
           }
           - Return [ bool ]
         }
+
+        Method [ <internal:gearman> public method enableExceptionHandler ] {
+
+          - Parameters [0] {
+          }
+          - Return [ bool ]
+        }
       }
     }
 
diff --git a/gearman-php81.patch b/gearman-php81.patch
deleted file mode 100644
index 0452954..0000000
--- a/gearman-php81.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7da13e4babc17067b2b45d6b37041c3c8ed91637 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Fri, 11 Jun 2021 08:05:40 +0200
-Subject: [PATCH] remove ZVAL_NEW_ARR usage
-
----
- php_gearman_worker.c    | 2 +-
- tests/skipifconnect.inc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/php_gearman_worker.c b/php_gearman_worker.c
-index 21b64e4..7ab5f6e 100644
---- a/php_gearman_worker.c
-+++ b/php_gearman_worker.c
-@@ -91,7 +91,7 @@ zend_object *gearman_worker_obj_new(zend_class_entry *ce) {
- 	zend_object_std_init(&(intern->std), ce);
- 	object_properties_init(&intern->std, ce);
- 
--	ZVAL_NEW_ARR(&intern->cb_list);
-+	array_init(&intern->cb_list);
- 	zend_hash_init(Z_ARRVAL(intern->cb_list), 0, NULL, cb_list_dtor, 0);
- 
- 	intern->std.handlers = &gearman_worker_obj_handlers;
-diff --git a/tests/skipifconnect.inc b/tests/skipifconnect.inc
-index e4df5e3..ca0e1db 100644
---- a/tests/skipifconnect.inc
-+++ b/tests/skipifconnect.inc
-@@ -4,7 +4,7 @@ if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
- 
- require_once('connect.inc');
- 
--$sock = fsockopen($host, $port);
-+$sock = @fsockopen($host, $port);
- if ($sock === false) {
-     die("skip unable to connect");
- }
diff --git a/php-pecl-gearman.spec b/php-pecl-gearman.spec
index 7c9b793..802c8b8 100644
--- a/php-pecl-gearman.spec
+++ b/php-pecl-gearman.spec
@@ -18,20 +18,18 @@
 
 %bcond_without      tests
 
-%global extver      2.1.0
+%global extver      2.1.2
 %global libver      1.1.0
 
 Name:           %{?scl_prefix}php-pecl-gearman
 Version:        %{extver}
-Release:        7%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 Summary:        PHP wrapper to libgearman
 
 License:        PHP-3.01
 URL:            https://pecl.php.net/package/gearman
 Source0:        https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
-Patch0:         %{pecl_name}-php81.patch
-
 BuildRequires:  libgearman-devel > %{libver}
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
@@ -76,8 +74,6 @@ sed -e 's/role="test"/role="src"/' \
 
 
 pushd %{sources}
-%patch -P0 -p1
-
 extver=$(sed -n '/#define PHP_GEARMAN_VERSION/{s/.* "//;s/".*$//;p}' php_gearman.h)
 if test "x${extver}" != "x%{version}"; then
    : Error: Upstream version is ${extver}, expecting %{version}.
@@ -195,6 +191,9 @@ fi
 
 
 %changelog
+* Thu Apr  4 2024 Remi Collet <remi@remirepo.net> - 2.1.2-1
+- update to 2.1.2
+
 * Wed Aug 30 2023 Remi Collet <remi@remirepo.net> - 2.1.0-7
 - rebuild for PHP 8.3.0RC1