From: Stephen Reay <stephen.reay@me.com>
Date: Sun, 11 Aug 2019 18:18:39 +0000 (+0700)
Subject: Fix return type on shmop_close
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5a7f61eca716064b5f0313691cce3455e77b15b;p=php

Fix return type on shmop_close
---

diff --git a/ext/shmop/php_shmop.stub.php b/ext/shmop/php_shmop.stub.php
index 4469d5afd1..6e3d1255b0 100644
--- a/ext/shmop/php_shmop.stub.php
+++ b/ext/shmop/php_shmop.stub.php
@@ -12,7 +12,7 @@ function shmop_read($shmid, int $start, int $count) {}
 /**
  * @param resource $shmid
  */
-function shmop_close($shmid): bool {}
+function shmop_close($shmid): void {}
 
 /**
  * @param resource $shmid
diff --git a/ext/shmop/php_shmop_arginfo.h b/ext/shmop/php_shmop_arginfo.h
index dddd8034ae..058109e255 100644
--- a/ext/shmop/php_shmop_arginfo.h
+++ b/ext/shmop/php_shmop_arginfo.h
@@ -13,7 +13,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_shmop_read, 0, 0, 3)
 	ZEND_ARG_TYPE_INFO(0, count, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shmop_close, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shmop_close, 0, 1, IS_VOID, 0)
 	ZEND_ARG_INFO(0, shmid)
 ZEND_END_ARG_INFO()
 
@@ -27,4 +27,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_shmop_write, 0, 0, 3)
 	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_shmop_delete arginfo_shmop_close
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shmop_delete, 0, 1, _IS_BOOL, 0)
+	ZEND_ARG_INFO(0, shmid)
+ZEND_END_ARG_INFO()