Rename Sysvshm to SysvSharedMemory

Author: kocsismate

UPGRADING

@@ -422,10 +422,10 @@ PHP 8.0 UPGRADE NOTES
     for `false`.
 
 - Sysvshm:
-  . shm_attach() will now return an Sysvshm object rather than a resource.
+  . shm_attach() will now return an SysvSharedMemory object rather than a resource.
     Return value checks using is_resource() should be replaced with checks
     for `false`. The shm_detach() function no longer has an effect, instead
-    the Sysvshm instance is automatically destroyed if it is no longer referenced.
+    the SysvSharedMemory instance is automatically destroyed if it is no longer referenced.
 
 - tidy:
   . The $use_include_path parameter, which was not used internally, has been

ext/sysvshm/sysvshm.c

@@ -32,7 +32,7 @@
 #include "Zend/zend_interfaces.h"
 #include "php_ini.h"
 
-/* Sysvshm class */
+/* SysvSharedMemory class */
 
 zend_class_entry *sysvshm_ce;
 static zend_object_handlers sysvshm_object_handlers;
@@ -54,7 +54,7 @@ static zend_object *sysvshm_create_object(zend_class_entry *class_type) {
 }
 
 static zend_function *sysvshm_get_constructor(zend_object *object) {
-	zend_throw_error(NULL, "Cannot directly construct Sysvshm, use shm_attach() instead");
+	zend_throw_error(NULL, "Cannot directly construct SysvSharedMemory, use shm_attach() instead");
 	return NULL;
 }
 
@@ -100,7 +100,7 @@ static int php_remove_shm_data(sysvshm_chunk_head *ptr, zend_long shm_varpos);
 PHP_MINIT_FUNCTION(sysvshm)
 {
 	zend_class_entry ce;
-	INIT_CLASS_ENTRY(ce, "Sysvshm", class_Sysvshm_methods);
+	INIT_CLASS_ENTRY(ce, "SysvSharedMemory", class_SysvSharedMemory_methods);
 	sysvshm_ce = zend_register_internal_class(&ce);
 	sysvshm_ce->ce_flags |= ZEND_ACC_FINAL;
 	sysvshm_ce->create_object = sysvshm_create_object;
@@ -185,7 +185,7 @@ PHP_FUNCTION(shm_attach)
 }
 /* }}} */
 
-/* {{{ proto bool shm_detach(Sysvshm shm_identifier)
+/* {{{ proto bool shm_detach(SysvSharedMemory shm_identifier)
    Disconnects from shared memory segment */
 PHP_FUNCTION(shm_detach)
 {
@@ -199,7 +199,7 @@ PHP_FUNCTION(shm_detach)
 }
 /* }}} */
 
-/* {{{ proto bool shm_remove(Sysvshm shm_identifier)
+/* {{{ proto bool shm_remove(SysvSharedMemory shm_identifier)
    Removes shared memory from Unix systems */
 PHP_FUNCTION(shm_remove)
 {
@@ -224,7 +224,7 @@ PHP_FUNCTION(shm_remove)
 }
 /* }}} */
 
-/* {{{ proto bool shm_put_var(Sysvshm shm_identifier, int variable_key, mixed variable)
+/* {{{ proto bool shm_put_var(SysvSharedMemory shm_identifier, int variable_key, mixed variable)
    Inserts or updates a variable in shared memory */
 PHP_FUNCTION(shm_put_var)
 {
@@ -260,7 +260,7 @@ PHP_FUNCTION(shm_put_var)
 }
 /* }}} */
 
-/* {{{ proto mixed shm_get_var(Sysvshm id, int variable_key)
+/* {{{ proto mixed shm_get_var(SysvSharedMemory id, int variable_key)
    Returns a variable from shared memory */
 PHP_FUNCTION(shm_get_var)
 {
@@ -298,7 +298,7 @@ PHP_FUNCTION(shm_get_var)
 }
 /* }}} */
 
-/* {{{ proto bool shm_has_var(Sysvshm id, int variable_key)
+/* {{{ proto bool shm_has_var(SysvSharedMemory id, int variable_key)
 	Checks whether a specific entry exists */
 PHP_FUNCTION(shm_has_var)
 {
@@ -316,7 +316,7 @@ PHP_FUNCTION(shm_has_var)
 }
 /* }}} */
 
-/* {{{ proto bool shm_remove_var(Sysvshm id, int variable_key)
+/* {{{ proto bool shm_remove_var(SysvSharedMemory id, int variable_key)
    Removes variable from shared memory */
 PHP_FUNCTION(shm_remove_var)
 {

ext/sysvshm/sysvshm.stub.php

@@ -2,22 +2,21 @@
 
 /** @generate-function-entries */
 
-final class Sysvshm
+final class SysvSharedMemory
 {
 }
 
-/** @return Sysvshm|false */
-function shm_attach(int $key, int $memsize = UNKNOWN, int $perm = 0666): Sysvshm|false {}
+function shm_attach(int $key, int $memsize = UNKNOWN, int $perm = 0666): SysvSharedMemory|false {}
 
-function shm_detach(Sysvshm $shm): bool {}
+function shm_detach(SysvSharedMemory $shm): bool {}
 
-function shm_has_var(Sysvshm $shm, int $variable_key): bool {}
+function shm_has_var(SysvSharedMemory $shm, int $variable_key): bool {}
 
-function shm_remove(Sysvshm $shm): bool {}
+function shm_remove(SysvSharedMemory $shm): bool {}
 
-function shm_put_var(Sysvshm $shm, int $variable_key, $variable): bool {}
+function shm_put_var(SysvSharedMemory $shm, int $variable_key, $variable): bool {}
 
 /** @return mixed */
-function shm_get_var(Sysvshm $shm, int $variable_key) {}
+function shm_get_var(SysvSharedMemory $shm, int $variable_key) {}
 
-function shm_remove_var(Sysvshm $shm, int $variable_key): bool {}
+function shm_remove_var(SysvSharedMemory $shm, int $variable_key): bool {}

ext/sysvshm/sysvshm_arginfo.h

@@ -1,30 +1,30 @@
 /* This is a generated file, edit the .stub.php file instead. */
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_shm_attach, 0, 1, Sysvshm, MAY_BE_FALSE)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_shm_attach, 0, 1, SysvSharedMemory, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, key, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, memsize, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, perm, IS_LONG, 0, "0666")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shm_detach, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, shm, Sysvshm, 0)
+	ZEND_ARG_OBJ_INFO(0, shm, SysvSharedMemory, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shm_has_var, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, shm, Sysvshm, 0)
+	ZEND_ARG_OBJ_INFO(0, shm, SysvSharedMemory, 0)
 	ZEND_ARG_TYPE_INFO(0, variable_key, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_shm_remove arginfo_shm_detach
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shm_put_var, 0, 3, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, shm, Sysvshm, 0)
+	ZEND_ARG_OBJ_INFO(0, shm, SysvSharedMemory, 0)
 	ZEND_ARG_TYPE_INFO(0, variable_key, IS_LONG, 0)
 	ZEND_ARG_INFO(0, variable)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_shm_get_var, 0, 0, 2)
-	ZEND_ARG_OBJ_INFO(0, shm, Sysvshm, 0)
+	ZEND_ARG_OBJ_INFO(0, shm, SysvSharedMemory, 0)
 	ZEND_ARG_TYPE_INFO(0, variable_key, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
@@ -52,6 +52,6 @@ static const zend_function_entry ext_functions[] = {
 };
 
 
-static const zend_function_entry class_Sysvshm_methods[] = {
+static const zend_function_entry class_SysvSharedMemory_methods[] = {
 	ZEND_FE_END
 };

ext/sysvshm/tests/002.phpt

@@ -45,14 +45,14 @@ bool(false)
 
 Warning: shm_attach(): Segment size must be greater than zero in %s on line %d
 bool(false)
-object(Sysvshm)#1 (0) {
+object(SysvSharedMemory)#1 (0) {
 }
-object(Sysvshm)#2 (0) {
+object(SysvSharedMemory)#2 (0) {
 }
-object(Sysvshm)#1 (0) {
+object(SysvSharedMemory)#1 (0) {
 }
-object(Sysvshm)#2 (0) {
+object(SysvSharedMemory)#2 (0) {
 }
-object(Sysvshm)#1 (0) {
+object(SysvSharedMemory)#1 (0) {
 }
 Done

ext/sysvshm/tests/shutdown_crash_0.phpt

@@ -16,7 +16,7 @@ shm_remove($s);
 var_dump($s = shm_attach($key, 1024));
 shm_remove($s);
 --EXPECT--
-object(Sysvshm)#1 (0) {
+object(SysvSharedMemory)#1 (0) {
 }
-object(Sysvshm)#2 (0) {
+object(SysvSharedMemory)#2 (0) {
 }