From: Stephen Reay <stephen.reay@me.com>
Date: Mon, 12 Aug 2019 07:53:01 +0000 (+0700)
Subject: Fixed inconsistent naming for stub, return type for shmop_size
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=434f5329f70b6b1bfb644db20f09b43b7212410c;p=php

Fixed inconsistent naming for stub, return type for shmop_size
---

diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c
index fcecf1e566..4f47372f31 100644
--- a/ext/shmop/shmop.c
+++ b/ext/shmop/shmop.c
@@ -24,7 +24,7 @@
 #include "php.h"
 #include "php_ini.h"
 #include "php_shmop.h"
-#include "php_shmop_arginfo.h"
+#include "shmop_arginfo.h"
 
 # ifndef PHP_WIN32
 # include <sys/ipc.h>
diff --git a/ext/shmop/php_shmop.stub.php b/ext/shmop/shmop.stub.php
similarity index 90%
rename from ext/shmop/php_shmop.stub.php
rename to ext/shmop/shmop.stub.php
index 6e3d1255b0..11a65fc728 100644
--- a/ext/shmop/php_shmop.stub.php
+++ b/ext/shmop/shmop.stub.php
@@ -16,9 +16,8 @@ function shmop_close($shmid): void {}
 
 /**
  * @param resource $shmid
- * @return int|false
  */
-function shmop_size($shmid) {}
+function shmop_size($shmid): int {}
 
 /**
  * @param resource $shmid
diff --git a/ext/shmop/php_shmop_arginfo.h b/ext/shmop/shmop_arginfo.h
similarity index 92%
rename from ext/shmop/php_shmop_arginfo.h
rename to ext/shmop/shmop_arginfo.h
index 058109e255..c91b4ace12 100644
--- a/ext/shmop/php_shmop_arginfo.h
+++ b/ext/shmop/shmop_arginfo.h
@@ -17,7 +17,7 @@ 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()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_shmop_size, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shmop_size, 0, 1, IS_LONG, 0)
 	ZEND_ARG_INFO(0, shmid)
 ZEND_END_ARG_INFO()