tl2php now generates RpcFunction serialization method stubs (#1403)

Author: hrissan

common/tl2php/gen-php-code.cpp

@@ -10,6 +10,7 @@
 #include <exception>
 #include <fstream>
 #include <ftw.h>
+#include <iomanip>
 #include <iterator>
 #include <map>
 #include <sstream>
@@ -326,12 +327,57 @@ struct FunctionGetTLFunctionName {
   const PhpClassRepresentation& class_repr;
 
   friend std::ostream& operator<<(std::ostream& os, const FunctionGetTLFunctionName& self) {
+    // we will remove ALL tl2php code soon, so we added a bit hackish code here
+    const char* header1 = R"(  /**
+   * @kphp-inline
+   *
+   * @return TL\RpcFunctionFetcher
+   */
+  public function typedStore())";
+    const char* header2 = R"(  /**
+   * @kphp-inline
+   *
+   * @return TL\RpcFunctionFetcher
+   */
+  public function typedFetch())";
+    const char* header_magic = R"(  /**
+   * @kphp-inline
+   *
+   * @return int
+   */
+  public function getTLFunctionMagic())";
+    const char* body_null = R"({
+    return null;
+  }
+
+)";
+    os << header_magic;
+    if (self.class_repr.is_interface) {
+      os << ";" << std::endl;
+    } else {
+      std::stringstream ss;
+      ss << std::hex << std::setw(8) << std::setfill('0') << self.class_repr.magic_id;
+      os << " {" << std::endl << "    return 0x" << ss.str() << ";" << std::endl << "  }" << SkipLine{};
+    }
     os << FunctionDeclaration{"getTLFunctionName", {}, "string", has_kphp_inline};
     if (self.class_repr.is_interface) {
-      return os << ";" << std::endl;
+      os << ";" << std::endl;
+    } else {
+      os << " {" << std::endl << "    return '" << self.class_repr.tl_name << "';" << std::endl << "  }" << SkipLine{};
     }
-
-    return os << " {" << std::endl << "    return '" << self.class_repr.tl_name << "';" << std::endl << "  }" << SkipLine{};
+    os << header1;
+    if (self.class_repr.is_interface) {
+      os << ";" << std::endl;
+    } else {
+      os << body_null;
+    }
+    os << header2;
+    if (self.class_repr.is_interface) {
+      os << ";" << std::endl;
+    } else {
+      os << body_null;
+    }
+    return os;
   }
 };
 

common/tl2php/php-classes.h

@@ -33,6 +33,7 @@ struct PhpClassField {
 
 struct PhpClassRepresentation {
   std::string tl_name;
+  int magic_id{};
   std::string php_class_namespace;
   std::string php_class_name;
   const PhpClassRepresentation* parent{nullptr};

common/tl2php/tl-to-php-classes-converter.cpp

@@ -152,6 +152,7 @@ std::unique_ptr<PhpClassRepresentation> TlToPhpClassesConverter::make_and_regist
   php_repr->class_fields = std::move(fields);
   php_repr->is_interface = false;
   php_repr->tl_name = name.tl_name;
+  php_repr->magic_id = magic_id;
   const auto emplaced = php_classes_.all_classes.emplace(name.class_full_name, *php_repr).second;
   assert(emplaced);
   php_classes_.magic_to_classes.emplace(magic_id, *php_repr);

tests/phpt/modulite/007_composer_ok/packages/vk-rpc/src/rpc_global.php

@@ -6,7 +6,28 @@ function globalFunctionInVkRpc() {}
 
 if (0) {
     class my_tl_f implements \VK\TL\RpcFunction {
-        function getTLFunctionName(): string { return "my_tl_f"; }
+        public function getTLFunctionName(): string { return "my_tl_f"; }
+        public function getTLFunctionMagic(): int {
+          return 0x12345678;
+        }
+
+        /**
+         * @kphp-inline
+         *
+         * @return VK\TL\RpcFunctionFetcher
+         */
+        public function typedStore() {
+          return null;
+        }
+
+        /**
+         * @kphp-inline
+         *
+         * @return VK\TL\RpcFunctionFetcher
+         */
+        public function typedFetch() {
+          return null;
+        }
     }
 }
 

tests/python/tests/rpc/php/VK/TL/RpcFunction.php

@@ -15,12 +15,30 @@
  */
 interface RpcFunction {
 
+  /**
+   * @kphp-inline
+   *
+   * @return int
+   */
+  public function getTLFunctionMagic();
   /**
    * @kphp-inline
    *
    * @return string
    */
   public function getTLFunctionName();
+  /**
+   * @kphp-inline
+   *
+   * @return TL\RpcFunctionFetcher
+   */
+  public function typedStore();
+  /**
+   * @kphp-inline
+   *
+   * @return TL\RpcFunctionFetcher
+   */
+  public function typedFetch();
 }
 
 /**

tests/python/tests/rpc/php/VK/TL/_common/Functions/rpcDestActor.php

@@ -55,6 +55,15 @@ public static function result(TL\RpcResponse $response) {
     return self::functionReturnValue($response->getResult());
   }
 
+  /**
+   * @kphp-inline
+   *
+   * @return int
+   */
+  public function getTLFunctionMagic() {
+    return 0x7568aabd;
+  }
+
   /**
    * @kphp-inline
    *
@@ -64,6 +73,24 @@ public function getTLFunctionName() {
     return 'rpcDestActor';
   }
 
+  /**
+   * @kphp-inline
+   *
+   * @return TL\RpcFunctionFetcher
+   */
+  public function typedStore(){
+    return null;
+  }
+
+  /**
+   * @kphp-inline
+   *
+   * @return TL\RpcFunctionFetcher
+   */
+  public function typedFetch(){
+    return null;
+  }
+
 }
 
 /**

tests/python/tests/rpc/php/VK/TL/_common/Functions/rpcDestActorFlags.php

@@ -65,6 +65,15 @@ public static function result(TL\RpcResponse $response) {
     return self::functionReturnValue($response->getResult());
   }
 
+  /**
+   * @kphp-inline
+   *
+   * @return int
+   */
+  public function getTLFunctionMagic() {
+    return 0xf0a5acf7;
+  }
+
   /**
    * @kphp-inline
    *
@@ -74,6 +83,24 @@ public function getTLFunctionName() {
     return 'rpcDestActorFlags';
   }
 
+  /**
+   * @kphp-inline
+   *
+   * @return TL\RpcFunctionFetcher
+   */
+  public function typedStore(){
+    return null;
+  }
+
+  /**
+   * @kphp-inline
+   *
+   * @return TL\RpcFunctionFetcher
+   */
+  public function typedFetch(){
+    return null;
+  }
+
 }
 
 /**

tests/python/tests/rpc/php/VK/TL/_common/Functions/rpcDestFlags.php

@@ -60,6 +60,15 @@ public static function result(TL\RpcResponse $response) {
     return self::functionReturnValue($response->getResult());
   }
 
+  /**
+   * @kphp-inline
+   *
+   * @return int
+   */
+  public function getTLFunctionMagic() {
+    return 0xe352035e;
+  }
+
   /**
    * @kphp-inline
    *
@@ -69,6 +78,24 @@ public function getTLFunctionName() {
     return 'rpcDestFlags';
   }
 
+  /**
+   * @kphp-inline
+   *
+   * @return TL\RpcFunctionFetcher
+   */
+  public function typedStore(){
+    return null;
+  }
+
+  /**
+   * @kphp-inline
+   *
+   * @return TL\RpcFunctionFetcher
+   */
+  public function typedFetch(){
+    return null;
+  }
+
 }
 
 /**

tests/python/tests/rpc/php/VK/TL/_common/Types/boolStat.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * AUTOGENERATED, DO NOT EDIT! If you want to modify it, check tl schema.
+ *
+ * This autogenerated code represents tl class for typed RPC API.
+ */
+
+namespace VK\TL\_common\Types;
+
+/**
+ * @kphp-tl-class
+ */
+class boolStat {
+
+  /** @var int */
+  public $statTrue = 0;
+
+  /** @var int */
+  public $statFalse = 0;
+
+  /** @var int */
+  public $statUnknown = 0;
+
+  /**
+   * @param int $statTrue
+   * @param int $statFalse
+   * @param int $statUnknown
+   */
+  public function __construct($statTrue = 0, $statFalse = 0, $statUnknown = 0) {
+    $this->statTrue = $statTrue;
+    $this->statFalse = $statFalse;
+    $this->statUnknown = $statUnknown;
+  }
+
+}