Merge pull request #19 from reactphp-parallel/drop-interface-from-proxy

Drop interface from generated proxies

Author: WyriHaximus

src/AbstractGeneratedProxy.php

@@ -26,14 +26,13 @@ final public function __construct(Channel $out, string $hash)
      *
      * @return mixed
      */
-    final protected function proxyCallToMainThread(string $interface, string $method, array $args)
+    final protected function proxyCallToMainThread(string $method, array $args)
     {
         $input = new Channel(1);
         $call  = new Call(
             $input,
             $this->hash,
             spl_object_hash($this),
-            $interface,
             $method,
             $args,
         );
@@ -44,10 +43,10 @@ final protected function proxyCallToMainThread(string $interface, string $method
         return $result;
     }
 
-    final protected function notifyMainThreadAboutDestruction(string $interface): void
+    final protected function notifyMainThreadAboutDestruction(): void
     {
         try {
-            $this->out->send(new Destruct($this->hash, spl_object_hash($this), $interface));
+            $this->out->send(new Destruct($this->hash, spl_object_hash($this)));
         } catch (Channel\Error\Closed $closed) {
             // @ignoreException
         }

src/Composer/InterfaceProxier.php

@@ -145,11 +145,6 @@ private function transformInterfaceIntoClass(Node\Stmt\Interface_ $interface): N
                 new Node\Expr\MethodCall(
                     new Node\Expr\Variable('this'),
                     'notifyMainThreadAboutDestruction',
-                    [
-                        new Node\Arg(
-                            new Node\Scalar\String_($this->interfaceName),
-                        ),
-                    ],
                 )
             ),
         )->makePublic()->makeFinal()->getNode();
@@ -187,9 +182,6 @@ private function populateMethod(Node\Stmt\ClassMethod $method): Node\Stmt\ClassM
             new Node\Expr\Variable('this'),
             'proxyCallToMainThread',
             [
-                new Node\Arg(
-                    new Node\Scalar\String_($this->interfaceName),
-                ),
                 new Node\Arg(
                     new Node\Expr\ConstFetch(
                         new Node\Name('__FUNCTION__'),

src/Message/Call.php

@@ -12,7 +12,6 @@ final class Call
 
     private string $hash;
     private string $objectHash;
-    private string $interface;
 
     private string $method;
 
@@ -22,12 +21,11 @@ final class Call
     /**
      * @param mixed[] $args
      */
-    public function __construct(Channel $channel, string $hash, string $objectHash, string $interface, string $method, array $args)
+    public function __construct(Channel $channel, string $hash, string $objectHash, string $method, array $args)
     {
         $this->channel    = $channel;
         $this->hash       = $hash;
         $this->objectHash = $objectHash;
-        $this->interface  = $interface;
         $this->method     = $method;
         $this->args       = $args;
     }
@@ -47,11 +45,6 @@ public function objectHash(): string
         return $this->objectHash;
     }
 
-    public function interface(): string
-    {
-        return $this->interface;
-    }
-
     public function method(): string
     {
         return $this->method;

src/Message/Destruct.php

@@ -8,13 +8,11 @@ final class Destruct
 {
     private string $hash;
     private string $objectHash;
-    private string $interface;
 
-    public function __construct(string $hash, string $objectHash, string $interface)
+    public function __construct(string $hash, string $objectHash)
     {
         $this->hash       = $hash;
         $this->objectHash = $objectHash;
-        $this->interface  = $interface;
     }
 
     public function hash(): string
@@ -26,9 +24,4 @@ public function objectHash(): string
     {
         return $this->objectHash;
     }
-
-    public function interface(): string
-    {
-        return $this->interface;
-    }
 }

tests/Message/CallTest.php

@@ -5,7 +5,6 @@
 namespace ReactParallel\Tests\ObjectProxy\Message;
 
 use parallel\Channel;
-use Psr\Log\LoggerInterface;
 use ReactParallel\ObjectProxy\Message\Call;
 use WyriHaximus\AsyncTestUtilities\AsyncTestCase;
 
@@ -23,16 +22,14 @@ public function getters(): void
         $channel    = new Channel(1);
         $hash       = bin2hex(random_bytes(1024));
         $objectHash = bin2hex(random_bytes(1024));
-        $interface  = LoggerInterface::class;
         $method     = 'hammer';
         $args       = [time()];
 
-        $call = new Call($channel, $hash, $objectHash, $interface, $method, $args);
+        $call = new Call($channel, $hash, $objectHash, $method, $args);
 
         self::assertSame($channel, $call->channel());
         self::assertSame($hash, $call->hash());
         self::assertSame($objectHash, $call->objectHash());
-        self::assertSame($interface, $call->interface());
         self::assertSame($method, $call->method());
         self::assertSame($args, $call->args());
     }