PHP TL GEN: PART 2

Makefile

@@ -154,6 +154,10 @@ cpp:
 	$(MAKE) cpp_gen
 	$(MAKE) cpp_build
 
+.PHONY: test_multi_lang_cases
+test_multi_lang_cases:
+	@cd internal/tlcodegen/test/codegen_test/; \
+	$(MAKE) run-all-languages-tests;
 
 .PHONY: test
 test:

cmd/tlgen/main2.go

@@ -76,6 +76,23 @@ func parseFlags(opt *tlcodegen.Gen2Options) {
 	flag.StringVar(&opt.RootCPPNamespace, "cpp-namespace", "",
 		`c++ root namespace, separated by '::' if more than 1 element`)
 
+	// PHP
+	flag.BoolVar(&opt.AddFunctionBodies, "php-serialization-bodies", false,
+		`whether to generate body to write/read generated structs and functions`)
+	flag.BoolVar(&opt.AddMetaData, "php-generate-meta", false,
+		`whether to generate methods to get meta information about tl objects`)
+	flag.BoolVar(&opt.AddFactoryData, "php-generate-factory", false,
+		`whether to generate factory of tl objects`)
+	flag.BoolVar(&opt.IgnoreUnusedInFunctionsTypes, "php-ignore-unused-types", true,
+		`whether to not generate types without usages in functions`)
+	flag.BoolVar(&opt.AddRPCTypes, "php-rpc-support", true,
+		`whether to generate special rpc types`)
+	flag.BoolVar(&opt.InplaceSimpleStructs, "php-inplace-simple-structs", true,
+		`whether to avoid generation of structs with no arguments and only 1 field`)
+
+	if opt.AddFactoryData {
+		opt.AddFunctionBodies = true
+	}
 	// .tlo
 	flag.StringVar(&opt.TLOPath, "tloPath", "",
 		"whether to serialize TL schema in binary form")

internal/tlcodegen/helpers_php.go

@@ -1,9 +1,9 @@
 package tlcodegen
 
-const BasicTlPathPhp = "basictl.php"
-const BasicTLCodePHP = `
-<?php
-include "run.php";
+const BasicTlPathPHP = "tl_streams.php"
+const BasicTLCodePHP = `<?php
+
+namespace VK\TL;
 
 class tl_constants {
     const tinyStringLen    = 253;
@@ -54,6 +54,17 @@ class tl_input_stream {
         }
     }
 
+    /** @return tuple(int, bool) */
+    public function read_int64() {
+        $data = unpack('q', $this->data, $this->offset);
+        if (!$data) {
+            return [0, false];
+        } else {
+            $this->offset += 8;
+            return [$data[1], true];
+        }
+    }
+
     /** @return tuple(bool, bool) */
     public function read_bool(int $false_tag, $true_tag) {
         [$tag, $success] = $this->read_uint32();
@@ -117,7 +128,7 @@ class tl_input_stream {
                 return ["", false];
             }
             $l64 = (ord($this->data[$this->offset + 7]) << 48) + (ord($this->data[$this->offset + 6]) << 40) + (ord($this->data[$this->offset + 5]) << 32) + (ord($this->data[$this->offset + 4]) << 24) + (ord($this->data[$this->offset + 3]) << 16) + (ord($this->data[$this->offset + 2]) << 8) + (ord($this->data[$this->offset + 1]) << 0);
-            // TODO: check l64 > maxint
+            // TODO: check l64 > max int
             $l = $l64;
             $this->offset += 8;
             $p = $l;
@@ -157,31 +168,48 @@ class tl_output_stream {
     public function get_data(): string {
         return $this->data;
     }
-
+
+	/** @return bool */
     public function write_uint32(int $value) {
         $this->data .= pack('V', $value);
+ 		return true;       
     }
 
+    /** @return bool */
     public function write_int32(int $value) {
         $this->data .= pack('l', $value);
+ 		return true;
     }
 
+    /** @return bool */
+    public function write_int64(int $value) {
+        $this->data .= pack('q', $value);
+ 		return true;
+    }
+
+    /** @return bool */
     public function write_bool(bool $value, int $false_tag, $true_tag) {
         if ($value) {
             $this->data .= pack('V', $true_tag);
         } else {
             $this->data .= pack('V', $false_tag);
         }
+ 		return true;
     }
 
+    /** @return bool */
     public function write_float(float $value) {
         $this->data .= pack('f', $value);
+ 		return true; 
     }
 
+    /** @return bool */
     public function write_double(float $value) {
         $this->data .= pack('d', $value);
+ 		return true; 
     }
 
+    /** @return bool */
     public function write_string(string $value) {
         $l = strlen($value);
         $p = 0;
@@ -220,6 +248,7 @@ class tl_output_stream {
         } else if ($p % 4 == 3) {
             $this->data .= chr(0);
         }
+ 		return true; 
     }
 }
 ?>
@@ -297,3 +326,41 @@ interface RpcResponse {
 
 #endif
 `
+
+const TLInterfacesPathPHP = "tl_interfaces.php"
+const TLInterfacesCodePHP = `<?php
+
+namespace VK\TL;
+
+use VK\TL;
+
+interface Readable {
+  /**
+   * @param TL\tl_input_stream $stream
+   * @return bool
+   */
+  public function read($stream);
+
+  /**
+   * @param TL\tl_input_stream $stream
+   * @return bool
+   */
+  public function read_boxed($stream);
+}
+
+interface Writeable {
+  /**
+   * @param TL\tl_output_stream $stream
+   * @return bool
+   */
+  public function write($stream);
+
+  /**
+   * @param TL\tl_output_stream $stream
+   * @return bool
+   */
+  public function write_boxed($stream);
+}
+
+interface TL_Object extends Readable, Writeable {}
+`

internal/tlcodegen/test/codegen_test/Makefile

@@ -0,0 +1,16 @@
+
+run-all-languages-tests:
+	make run-php-tests; \
+ 	make run-cpp-tests; \
+ 	make run-golang-tests;
+
+run-php-tests:
+	cd php && make run-all-tests
+
+run-cpp-tests:
+	cd cpp && make run-all-tests
+
+run-golang-tests:
+	cd ../../../.. && make goldmaster_nocompile;
+	cd golang;
+	go test ./...

internal/tlcodegen/test/codegen_test/cpp/Makefile

@@ -5,10 +5,16 @@ SCHEMA_DIR = $(CPP_DIR)/schema_cpp
 CC = g++
 CFLAGS = -std=c++17 -O3 -Wno-noexcept-type -g -Wall -Wextra -Werror=return-type -Wno-unused-parameter
 
+build-test-gen:
+	@cd ../../../../../; \
+	$(MAKE) build; \
+	$(MAKE) cpp_gen_test_data;
+
 # run in project root "make cpp_gen_test_data"
-run-all-tests:
-	make run-objects-test
-	make run-functions-test
+run-all-tests: build-test-gen
+	make run-objects-test; \
+	make run-functions-test; \
+	make clean-build;
 
 clean-build:
 	rm -rf build