1.1 --- a/php/sigfiles/generate.php	Mon Apr 24 12:39:46 2017 +0200
     1.2 +++ b/php/sigfiles/generate.php	Mon Apr 24 16:28:13 2017 +0200
     1.3 @@ -835,9 +835,17 @@
     1.4  	$i = 0;
     1.5  	foreach ($parameters as $parameter) {
     1.6  		if ($parameter['name'] != "...") {
     1.7 +			if ($i++ > 0) {
     1.8 +				print ", ";
     1.9 +			}
    1.10                          $type = sanitizeType($parameter['type']);
    1.11 -                        $nullable = false;
    1.12 -                        $param_value = '';
    1.13 +			if ($type) {
    1.14 +				print "{$type} ";
    1.15 +			}
    1.16 +			if (@$parameter['isreference']) {
    1.17 +				print "&";
    1.18 +			}
    1.19 +                        print "\${$parameter['name']}";
    1.20  			if (@$parameter['isoptional']) {
    1.21  				if (array_key_exists('defaultvalue', $parameter)) {
    1.22  					$value = $parameter['defaultvalue'];
    1.23 @@ -851,32 +859,11 @@
    1.24                                          } else {
    1.25                                              $value = "'{$value}'";
    1.26                                          }
    1.27 -                                        $param_value = " = {$value}";
    1.28 +                                        print " = {$value}";
    1.29  				} else {
    1.30 -                                        $nullable = true;
    1.31 -                                        if (!$type) {
    1.32 -                                            $param_value = " = null";
    1.33 -                                        }
    1.34 +                                        print " = null";
    1.35  				}
    1.36  			}
    1.37 -                    
    1.38 -			if ($i++ > 0) {
    1.39 -				print ", ";
    1.40 -			}
    1.41 -			if ($type) {
    1.42 -                                if ($nullable) {
    1.43 -                                    print "?";
    1.44 -                                }
    1.45 -				print "{$type} ";
    1.46 -			}
    1.47 -			if (@$parameter['isreference']) {
    1.48 -				print "&";
    1.49 -			}
    1.50 -                        print "\${$parameter['name']}";
    1.51 -                        
    1.52 -                        if ($param_value) {
    1.53 -                            print $param_value;
    1.54 -                        }
    1.55  
    1.56  		}
    1.57  	}