actualized calls

Author: Lev Zenin

Source/phpClass.pas

@@ -367,7 +367,7 @@ function class_call_method(method : zend_pchar; ht : integer; return_value : pzv
              M.ZendVar.AsZendVariable := return_value; //direct access to zend variable
              M.FOnExecute(Obj, M.Parameters, M.ReturnValue, M.FZendVar.AsZendVariable, this_ptr, TSRMLS_DC);
              if M.ZendVar.ISNull then   //perform variant conversion
-              variant2zval(M.ReturnValue, return_value);
+              VariantToZend(M.ReturnValue, return_value);
 
           end;
        end;

Source/phpModules.pas

@@ -265,7 +265,7 @@ function rshutdown (_type : integer; module_number : integer; TSRMLS_DC : pointe
 procedure DispatchRequest(ht : integer; return_value : pzval; return_value_ptr : ppzval;
             this_ptr : pzval; return_value_used : integer; TSRMLS_DC : pointer); cdecl;
 begin
-  ZVAL(return_value);
+  ZvalVal(return_value);
   if Assigned(Application) then
    try
      Application.HandleRequest(ht, return_value, return_value_ptr, this_ptr,  return_value_used, TSRMLS_DC);
@@ -407,22 +407,30 @@ function TCustomPHPExtension.FunctionByName(
 
 procedure TCustomPHPExtension.phpwrite(str: zend_pchar; str_len: integer);
 begin
+{$IFNDEF PHP550}
   php_body_write(str, str_len, FTSRMLS);
+{$ENDIF}
 end;
 
 procedure TCustomPHPExtension.phpwrite_h(str: zend_pchar; str_len: integer);
 begin
+{$IFNDEF PHP550}
   php_header_write(str, str_len, FTSRMLS);
+{$ENDIF}
 end;
 
 procedure TCustomPHPExtension.puts(str: zend_pchar);
 begin
+{$IFNDEF PHP550}
   php_body_write(str, strlen(str), FTSRMLS);
+{$ENDIF}
 end;
 
 procedure TCustomPHPExtension.puts_h(str: zend_pchar);
 begin
+{$IFNDEF PHP550}
   php_header_write(str, strlen(str), FTSRMLS);
+{$ENDIF}
 end;
 
 procedure TCustomPHPExtension.ReportError(ErrType: integer;
@@ -466,6 +474,7 @@ procedure DoneVCLApplication;
    VCL.Forms.Application.ShowHint := False;
    VCL.Forms.Application.Destroying;
    VCL.Forms.Application.DestroyComponents;
+   {$ENDIF}
   except
   end; 
 end;
@@ -702,7 +711,7 @@ procedure TPHPApplication.HandleRequest(ht: integer;  return_value : pzval; retu
                      FZendVar.AsZendVariable := return_value;
                      AFunction.OnExecute(DataModule, FParameters, ReturnValue, FZendVar, TSRMLS_DC);
                      if FZendVar.ISNull then
-                      variant2zval(ReturnValue, return_value);
+                      VariantToZend(ReturnValue, return_value);
                     finally
                       FZendVar.Free;
                     end;