jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[php] Fix test failures due to undefined GETSET constant

Browse source 
Move the constant into the class - the definition outside the class
doesn't seem to work with PHP 7.3.
This commit is contained in:
Olly Betts 2019-02-08 14:56:39 +13:00
commit 21b3c06de6
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Examples/test-suite/php/tests.php
View file

@ -1,15 +1,15 @@
<?php
// do we have true global vars or just GETSET functions?
// Used to filter out get/set global functions to fake vars...
define(GETSET,1);
$_original_functions=get_defined_functions();
$_original_globals=1;
$_original_classes=get_declared_classes();
$_original_globals=array_keys($GLOBALS);
class check {
// do we have true global vars or just GETSET functions?
// Used to filter out get/set global functions to fake vars...
const GETSET = 1;
function get_extra_classes($ref=FALSE) {
static $extra;
global $_original_classes;
@ -35,7 +35,7 @@ class check {
foreach($_original_functions[internal] as $func) unset($df[$func]);
// Now chop out any get/set accessors
foreach(array_keys($df) as $func)
if ((GETSET && preg_match('/_[gs]et$/', $func)) ||
if ((self::GETSET && preg_match('/_[gs]et$/', $func)) ||
preg_match('/^new_/', $func) ||
preg_match('/_(alter|get)_newobject$/', $func))
$extrags[]=$func;
@ -50,7 +50,7 @@ class check {
static $extra;
global $_original_globals;
if (! is_array($extra)) {
if (GETSET) {
if (self::GETSET) {
$_extra=array();
foreach(check::get_extra_functions(false,1) as $global) {
if (preg_match('/^(.*)_[sg]et$/', $global, $match))
@ -100,13 +100,13 @@ class check {
function set($var,$value) {
$func=$var."_set";
if (GETSET) $func($value);
if (self::GETSET) $func($value);
else $_GLOBALS[$var]=$value;
}
function &get($var) {
$func=$var."_get";
if (GETSET) return $func();
if (self::GETSET) return $func();
else return $_GLOBALS[$var];
}
@ -171,7 +171,7 @@ class check {
$missing=array();
$extra=array_flip(check::get_extra_globals());
foreach ($globals as $glob) {
if (GETSET) {
if (self::GETSET) {
if (! isset($extra[$glob])) $missing[]=$glob;
else unset($extra[$glob]);
} else {