From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 7 Oct 2016 14:35:37 +0000 (+0200)
Subject: Document that ext/shmop deals with resources as of PHP 7.0.0
X-Git-Tag: php-7.1.0RC4~84^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=825e0fd43058822632a7f78a2800a8a9a1c00319;p=php

Document that ext/shmop deals with resources as of PHP 7.0.0

Second attempt
---

diff --git a/UPGRADING b/UPGRADING
index 1be3253209..51b54d2d09 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -727,6 +727,9 @@ out, that the corresponding SDK isn't available anymore.
 - Openssl
   minimum supported OpenSSL version series was raised to 0.9.8
 
+- Shmop
+  The shmop identifiers have been changed from ints to resources of type shmop.
+
 ========================================
 10. New Global Constants
 ========================================
diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c
index d647790aa0..29315d32f9 100644
--- a/ext/shmop/shmop.c
+++ b/ext/shmop/shmop.c
@@ -142,7 +142,7 @@ PHP_MINFO_FUNCTION(shmop)
 }
 /* }}} */
 
-/* {{{ proto int shmop_open (int key, string flags, int mode, int size)
+/* {{{ proto resource shmop_open (int key, string flags, int mode, int size)
    gets and attaches a shared memory segment */
 PHP_FUNCTION(shmop_open)
 {
@@ -223,7 +223,7 @@ err:
 }
 /* }}} */
 
-/* {{{ proto string shmop_read (int shmid, int start, int count)
+/* {{{ proto string shmop_read (resource shmid, int start, int count)
    reads from a shm segment */
 PHP_FUNCTION(shmop_read)
 {
@@ -261,7 +261,7 @@ PHP_FUNCTION(shmop_read)
 }
 /* }}} */
 
-/* {{{ proto void shmop_close (int shmid)
+/* {{{ proto void shmop_close (resource shmid)
    closes a shared memory segment */
 PHP_FUNCTION(shmop_close)
 {
@@ -281,7 +281,7 @@ PHP_FUNCTION(shmop_close)
 }
 /* }}} */
 
-/* {{{ proto int shmop_size (int shmid)
+/* {{{ proto int shmop_size (resource shmid)
    returns the shm size */
 PHP_FUNCTION(shmop_size)
 {
@@ -300,7 +300,7 @@ PHP_FUNCTION(shmop_size)
 }
 /* }}} */
 
-/* {{{ proto int shmop_write (int shmid, string data, int offset)
+/* {{{ proto int shmop_write (resource shmid, string data, int offset)
    writes to a shared memory segment */
 PHP_FUNCTION(shmop_write)
 {
@@ -335,7 +335,7 @@ PHP_FUNCTION(shmop_write)
 }
 /* }}} */
 
-/* {{{ proto bool shmop_delete (int shmid)
+/* {{{ proto bool shmop_delete (resource shmid)
    mark segment for deletion */
 PHP_FUNCTION(shmop_delete)
 {