From b57248cc1a0afd442f05bb3ccaa3ea021221c358 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Wed, 27 Jul 2022 08:49:15 +1200
Subject: [PATCH] [php] Add parentheses around $value when casting

In some cases $value can be an expression without parentheses around
it, and we want to cast the result of the whole expression.
---
 Lib/php/const.i | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Lib/php/const.i b/Lib/php/const.i
index 6e83ffe88..33060dc04 100644
--- a/Lib/php/const.i
+++ b/Lib/php/const.i
@@ -12,11 +12,11 @@
                         unsigned char,
                         signed char,
                         enum SWIGTYPE %{
-  zend_declare_class_constant_long(SWIG_Php_ce_$class, "$const_name", sizeof("$const_name") - 1, ($1_type)$value);
+  zend_declare_class_constant_long(SWIG_Php_ce_$class, "$const_name", sizeof("$const_name") - 1, ($1_type)($value));
 %}
 
 %typemap(classconsttab) bool %{
-  zend_declare_class_constant_bool(SWIG_Php_ce_$class, "$const_name", sizeof("$const_name") - 1, ($1_type)$value);
+  zend_declare_class_constant_bool(SWIG_Php_ce_$class, "$const_name", sizeof("$const_name") - 1, ($1_type)($value));
 %}
 
 %typemap(classconsttab) float,
@@ -48,7 +48,7 @@
 {
   zval z;
   ZVAL_UNDEF(&z);
-  SWIG_SetPointerZval(&z, (void*)$value, $1_descriptor, 0);
+  SWIG_SetPointerZval(&z, (void*)($value), $1_descriptor, 0);
   zval_copy_ctor(&z);
   zend_declare_class_constant(SWIG_Php_ce_$class, "$const_name", sizeof("$const_name") - 1, &z);
 }
@@ -65,10 +65,10 @@
                    unsigned char,
                    signed char,
                    enum SWIGTYPE
-  "SWIG_LONG_CONSTANT($symname, ($1_type)$value);";
+  "SWIG_LONG_CONSTANT($symname, ($1_type)($value));";
 
 %typemap(consttab) bool
-  "SWIG_BOOL_CONSTANT($symname, ($1_type)$value);";
+  "SWIG_BOOL_CONSTANT($symname, ($1_type)($value));";
 
 %typemap(consttab) float,
                    double
@@ -92,7 +92,7 @@
                    SWIGTYPE [] {
   zend_constant c;
   ZVAL_UNDEF(&c.value);
-  SWIG_SetPointerZval(&c.value, (void*)$value, $1_descriptor, 0);
+  SWIG_SetPointerZval(&c.value, (void*)($value), $1_descriptor, 0);
   zval_copy_ctor(&c.value);
   c.name = zend_string_init("$symname", sizeof("$symname") - 1, 0);
   SWIG_ZEND_CONSTANT_SET_FLAGS(&c, CONST_CS, module_number);