Fix PyClass, Added Helper

swoole · Sep 6, 2024 · dbe4905 · dbe4905
1 parent bca7b42
commit dbe4905
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/lib/phpy/Helper.php b/lib/phpy/Helper.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace phpy;
+
+use PyCore;
+
+class Helper
+{
+    public static function printTraceback($traceback): void
+    {
+        $frame = $traceback;
+        while ($frame) {
+            PyCore::print($frame->tb_frame);
+            $frame = $frame->tb_next;
+        }
+    }
+}
diff --git a/lib/phpy/PyClass.php b/lib/phpy/PyClass.php
@@ -17,6 +17,26 @@ class PyClass
     protected string $_proxyClass;
     private string $_proxyFile;
 
+    const IGNORE_METHODS = [
+        '__construct',
+        '__destruct',
+        '__call',
+        '__callStatic',
+        '__get',
+        '__set',
+        '__isset',
+        '__unset',
+        '__sleep',
+        '__wakeup',
+        '__toString',
+        '__invoke',
+        '__set_state',
+        '__clone',
+        '__debugInfo',
+        'self',
+        'super',
+    ];
+
     /**
      * @throws \Exception
      */
@@ -71,7 +91,7 @@ private function makeProxy(): void
         $methods = [];
         foreach ($refMethods as $method) {
             $modifiers = $method->getModifiers();
-            if (str_starts_with($method->name, '__')
+            if (in_array($method->name, self::IGNORE_METHODS)
                 or ($modifiers & ReflectionMethod::IS_STATIC)
                 or ($modifiers & ReflectionMethod::IS_PRIVATE)
                 or ($modifiers & ReflectionMethod::IS_ABSTRACT)) {

diff --git a/lib/phpy/proxy.tpl b/lib/phpy/proxy.tpl
@@ -13,6 +13,6 @@ class <?=$this->_proxyClass?>(<?=implode(', ', $parents)?>):
 
 <?php foreach($methods as $m):?>
   def <?=$m['name']?>(self, <?=$m['argv']?>):
-    self.__this.call('<?=$m['name']?>', <?=$m['argv']?>)
+    return self.__this.call('<?=$m['name']?>', <?=$m['argv']?>)
 
 <?php endforeach; ?>