tested mac

miyako · Dec 5, 2024 · 809d9b1 · 809d9b1
1 parent a1a154b
commit 809d9b1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/php/Project/Sources/Classes/PHP.4dm b/php/Project/Sources/Classes/PHP.4dm
@@ -2,14 +2,22 @@ Class extends _CLI
 
 Class constructor($controller : 4D:C1709.Class; $ini : 4D:C1709.File)
 
-	Super:C1705("php"; $controller)
+	Super:C1705("php"; $controller=Null:C1517 ? cs:C1710._PHP_Controller : $controller)
 
 	If (OB Instance of:C1731($ini; 4D:C1709.File))
 		If ($ini.exists)
 			This:C1470.ini:=This:C1470.expand($ini).path
 		End if 
 	End if 
 
+Function get worker() : 4D:C1709.SystemWorker
+
+	return This:C1470.controller.worker
+
+Function get controller() : cs:C1710._PHP_Controller
+
+	return This:C1470._controller
+
 Function terminate()
 
 	This:C1470.controller.terminate()

diff --git a/php/Project/Sources/Classes/PHP_CGI.4dm b/php/Project/Sources/Classes/PHP_CGI.4dm
@@ -32,7 +32,7 @@ Function get utilityFile()
 
 	return This:C1470._utilityFile
 
-Function get FULL_PATH_TO_4D_Execute_PHP()
+Function get FULL_PATH_TO_4D_Execute_PHP() : Text
 
 	return This:C1470.quote(This:C1470.utilityFile.path)
 

diff --git a/php/Project/Sources/Classes/_PHP_Controller.4dm b/php/Project/Sources/Classes/_PHP_Controller.4dm
@@ -11,6 +11,7 @@ Function onDataError($worker : 4D:C1709.SystemWorker; $params : Object)
 Function onResponse($worker : 4D:C1709.SystemWorker; $params : Object)
 
 	This:C1470.instance.data:=$worker.response
+	This:C1470.instance.error:=$worker.responseError
 
 Function onError($worker : 4D:C1709.SystemWorker; $params : Object)
 

diff --git a/php/Project/Sources/Methods/Compiler_Variables.4dm b/php/Project/Sources/Methods/Compiler_Variables.4dm
@@ -0,0 +1,2 @@
+//%attributes = {"invisible":true}
+C_OBJECT:C1216(__CLI__)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		//%attributes = {"invisible":true}
		C_OBJECT:C1216(__CLI__)