Merge pull request #3 from reactphp-parallel/transform-work-into-an-interface

Make Work and Result contracts instead of concrete implementations

Author: WyriHaximus

src/Result.php

@@ -4,17 +4,7 @@
 
 namespace ReactParallel\Pool\Worker;
 
-final class Result
+interface Result
 {
-    private object $result;
-
-    public function __construct(object $result)
-    {
-        $this->result = $result;
-    }
-
-    public function result(): object
-    {
-        return $this->result;
-    }
+    public function result(): object;
 }

src/Work.php

@@ -4,17 +4,7 @@
 
 namespace ReactParallel\Pool\Worker;
 
-final class Work
+interface Work
 {
-    private object $result;
-
-    public function __construct(object $result)
-    {
-        $this->result = $result;
-    }
-
-    public function work(): object
-    {
-        return $this->result;
-    }
+    public function work(): object;
 }

src/Workers/Result.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ReactParallel\Pool\Worker\Workers;
+
+use ReactParallel\Pool\Worker\Result as ResultContract;
+
+final class Result implements ResultContract
+{
+    private object $result;
+
+    public function __construct(object $result)
+    {
+        $this->result = $result;
+    }
+
+    public function result(): object
+    {
+        return $this->result;
+    }
+}

src/Workers/ReturnWorker.php

@@ -4,13 +4,12 @@
 
 namespace ReactParallel\Pool\Worker\Workers;
 
-use ReactParallel\Pool\Worker\Result;
-use ReactParallel\Pool\Worker\Work;
+use ReactParallel\Pool\Worker\Work as WorkContract;
 use ReactParallel\Pool\Worker\Work\Worker as WorkerInterface;
 
 final class ReturnWorker implements WorkerInterface
 {
-    public function perform(Work $work): Result
+    public function perform(WorkContract $work): Result
     {
         return new Result($work->work());
     }

src/Workers/ThrowingReturnWorker.php

@@ -4,13 +4,12 @@
 
 namespace ReactParallel\Pool\Worker\Workers;
 
-use ReactParallel\Pool\Worker\Result;
-use ReactParallel\Pool\Worker\Work;
+use ReactParallel\Pool\Worker\Work as WorkContract;
 use ReactParallel\Pool\Worker\Work\Worker as WorkerInterface;
 
 final class ThrowingReturnWorker implements WorkerInterface
 {
-    public function perform(Work $work): Result
+    public function perform(WorkContract $work): Result
     {
         throw new ThrownWork($work);
     }

src/Workers/Work.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ReactParallel\Pool\Worker\Workers;
+
+use ReactParallel\Pool\Worker\Work as WorkContract;
+
+final class Work implements WorkContract
+{
+    private object $work;
+
+    public function __construct(object $work)
+    {
+        $this->work = $work;
+    }
+
+    public function work(): object
+    {
+        return $this->work;
+    }
+}

tests/Thread/PerformerTest.php

@@ -9,9 +9,9 @@
 use parallel\Runtime;
 use ReactParallel\Pool\Worker\Message\Work as WorkMessage;
 use ReactParallel\Pool\Worker\Thread\Performer;
-use ReactParallel\Pool\Worker\Work;
 use ReactParallel\Pool\Worker\Workers\ReturnWorkerFactory;
 use ReactParallel\Pool\Worker\Workers\ThrowingReturnWorkerFactory;
+use ReactParallel\Pool\Worker\Workers\Work;
 use WyriHaximus\AsyncTestUtilities\AsyncTestCase;
 
 use function dirname;

tests/WorkerTest.php

@@ -10,11 +10,11 @@
 use ReactParallel\EventLoop\EventLoopBridge;
 use ReactParallel\Pool\Infinite\Group;
 use ReactParallel\Pool\Infinite\Infinite;
-use ReactParallel\Pool\Worker\Work;
 use ReactParallel\Pool\Worker\Worker;
 use ReactParallel\Pool\Worker\Workers\ReturnWorkerFactory;
 use ReactParallel\Pool\Worker\Workers\ThrowingReturnWorkerFactory;
 use ReactParallel\Pool\Worker\Workers\ThrownWork;
+use ReactParallel\Pool\Worker\Workers\Work;
 use Throwable;
 use WyriHaximus\AsyncTestUtilities\AsyncTestCase;
 use WyriHaximus\PoolInfo\Info;

tests/Workers/ReturnTest.php

@@ -5,8 +5,8 @@
 namespace ReactParallel\Tests\Pool\Worker\Workers;
 
 use Money\Money;
-use ReactParallel\Pool\Worker\Work;
 use ReactParallel\Pool\Worker\Workers\ReturnWorkerFactory;
+use ReactParallel\Pool\Worker\Workers\Work;
 use WyriHaximus\AsyncTestUtilities\AsyncTestCase;
 
 final class ReturnTest extends AsyncTestCase

tests/Workers/ThrowingReturnTest.php

@@ -5,9 +5,9 @@
 namespace ReactParallel\Tests\Pool\Worker\Workers;
 
 use Money\Money;
-use ReactParallel\Pool\Worker\Work;
 use ReactParallel\Pool\Worker\Workers\ThrowingReturnWorkerFactory;
 use ReactParallel\Pool\Worker\Workers\ThrownWork;
+use ReactParallel\Pool\Worker\Workers\Work;
 use Throwable;
 use WyriHaximus\AsyncTestUtilities\AsyncTestCase;