Merge pull request #7 from reactphp-parallel/generics

Docblock based generics
reactphp-parallel · Aug 18, 2020 · 8bc733c · 8bc733c
2 parents e87bbbb + 0e74a88
commit 8bc733c
Show file tree

Hide file tree

Showing 29 changed files with 163 additions and 99 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ use Money\Money;
 use React\EventLoop\Factory;
 use ReactParallel\Factory as ParallelFactory;
 use ReactParallel\Pool\Worker\Workers\ReturnWorkerFactory;
-use ReactParallel\Pool\Worker\Workers\Work;
+use ReactParallel\Pool\Worker\Workers\WorkObject;
 
 require dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor/autoload.php';
 
@@ -33,7 +33,7 @@ $parallelFactory = new ParallelFactory($loop);
 $workerFactory = new ReturnWorkerFactory();
 
 $pool = new \ReactParallel\Pool\Worker\Worker($parallelFactory, $workerFactory, 133);
-$pool->perform(new Work(Money::EUR(512)))->always(function () use ($pool) {
+$pool->perform(new WorkObject(Money::EUR(512)))->always(function () use ($pool) {
     $pool->close();
 })->done(function (Money $money) {
     echo $money->getAmount();

diff --git a/composer.lock b/composer.lock
diff --git a/examples/basic-return.php b/examples/basic-return.php
@@ -4,7 +4,7 @@
 use React\EventLoop\Factory;
 use ReactParallel\Factory as ParallelFactory;
 use ReactParallel\Pool\Worker\Workers\ReturnWorkerFactory;
-use ReactParallel\Pool\Worker\Workers\Work;
+use ReactParallel\Pool\Worker\Workers\WorkObject;
 
 require dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor/autoload.php';
 
@@ -13,7 +13,7 @@
 $workerFactory = new ReturnWorkerFactory();
 
 $pool = new \ReactParallel\Pool\Worker\Worker($parallelFactory, $workerFactory, 133);
-$pool->perform(new Work(Money::EUR(512)))->always(function () use ($pool) {
+$pool->perform(new WorkObject(Money::EUR(512)))->always(function () use ($pool) {
     $pool->close();
 })->done(function (Money $money) {
     echo $money->getAmount();

diff --git a/examples/return.php b/examples/return.php
@@ -4,7 +4,7 @@
 use React\EventLoop\Factory;
 use ReactParallel\Factory as ParallelFactory;
 use ReactParallel\Pool\Worker\Workers\ReturnWorkerFactory;
-use ReactParallel\Pool\Worker\Workers\Work;
+use ReactParallel\Pool\Worker\Workers\WorkObject;
 use function React\Promise\all;
 
 require dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor/autoload.php';
@@ -19,7 +19,7 @@
 $func = function () use (&$promises, &$i, $pool, &$func, $loop) {
     var_export(iterator_to_array($pool->info()));
     echo $i, PHP_EOL;
-    $promises[] = $pool->perform(new Work(Money::EUR($i)));
+    $promises[] = $pool->perform(new WorkObject(Money::EUR($i)));
     echo $i, PHP_EOL;
     if ($i === 512) {
         all($promises)->then(function (array $monies) use ($pool): void {

diff --git a/infection.json.dist b/infection.json.dist
@@ -12,7 +12,7 @@
         "@default": true,
         "FunctionCallRemoval": {
             "ignore": [
-                "ReactParallel\\Pool\\Worker\\Worker::perform::76"
+                "ReactParallel\\Pool\\Worker\\Worker::perform::88"
             ]
         },
         "GreaterThan": {
@@ -27,25 +27,37 @@
         },
         "Identical": {
             "ignore": [
-                "ReactParallel\\Pool\\Worker\\Thread::__construct::43",
+                "ReactParallel\\Pool\\Worker\\Thread::__construct::44",
                 "ReactParallel\\Pool\\Worker\\Thread::close::85",
-                "ReactParallel\\Pool\\Worker\\Worker::getIdleThread::137"
+                "ReactParallel\\Pool\\Worker\\Worker::getIdleThread::149"
             ]
         },
         "MethodCallRemoval": {
             "ignore": [
-                "ReactParallel\\Pool\\Worker\\Infinite::startTtlTimer::189",
-                "ReactParallel\\Pool\\Worker\\Thread::__construct::44",
-                "ReactParallel\\Pool\\Worker\\Thread::close::89",
-                "ReactParallel\\Pool\\Worker\\Worker::perform::87",
-                "ReactParallel\\Pool\\Worker\\Worker::kill::111",
-                "ReactParallel\\Pool\\Worker\\Worker::getIdleThread::138",
-                "ReactParallel\\Pool\\Worker\\Worker::startTtlTimer::164"
+                "ReactParallel\\Pool\\Worker\\Thread::__construct::40",
+                "ReactParallel\\Pool\\Worker\\Thread::__construct::45",
+                "ReactParallel\\Pool\\Worker\\Thread::__construct::49",
+                "ReactParallel\\Pool\\Worker\\Thread::__construct::55",
+                "ReactParallel\\Pool\\Worker\\Thread::perform::77",
+                "ReactParallel\\Pool\\Worker\\Thread::close::84",
+                "ReactParallel\\Pool\\Worker\\Thread::close::90",
+                "ReactParallel\\Pool\\Worker\\Thread\\Performer::create::30",
+                "ReactParallel\\Pool\\Worker\\Thread\\Performer::create::32",
+                "ReactParallel\\Pool\\Worker\\Worker::perform::99",
+                "ReactParallel\\Pool\\Worker\\Worker::kill::123",
+                "ReactParallel\\Pool\\Worker\\Worker::getIdleThread::150",
+                "ReactParallel\\Pool\\Worker\\Worker::startTtlTimer::176"
             ]
         },
         "NotIdentical": {
             "ignore": [
-                "ReactParallel\\Pool\\Worker\\Thread::close::85"
+                "ReactParallel\\Pool\\Worker\\Thread::close::86"
+            ]
+        },
+        "PublicVisibility": {
+            "ignore": [
+                "ReactParallel\\Pool\\Worker\\Worker::close::82",
+                "ReactParallel\\Pool\\Worker\\Worker::perform::77"
             ]
         }
     }

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,4 +1,5 @@
 parameters:
+	checkGenericClassInNonGenericObjectType: false
 	ignoreErrors:
 		- '#Call to an undefined method React\\Promise\\PromiseInterface::always\(\).#'
 		- '#Call to an undefined method React\\Promise\\PromiseInterface::done\(\).#'
@@ -10,4 +11,4 @@ parameters:
 			- ReactParallel\Tests\AbstractPoolTest
 
 includes:
-	- vendor/wyrihaximus/async-test-utilities/rules.neon
+	- vendor/wyrihaximus/async-test-utilities/rules.neon
diff --git a/src/Message/Outcome.php b/src/Message/Outcome.php
@@ -4,7 +4,7 @@
 
 namespace ReactParallel\Pool\Worker\Message;
 
-use ReactParallel\Pool\Worker\Message;
+use ReactParallel\Pool\Worker\Work\Message;
 
 interface Outcome extends Message
 {

diff --git a/src/Message/PositiveOutcome.php b/src/Message/PositiveOutcome.php
@@ -4,7 +4,7 @@
 
 namespace ReactParallel\Pool\Worker\Message;
 
-use ReactParallel\Pool\Worker\Result as UnitOfResult;
+use ReactParallel\Pool\Worker\Work\Result as UnitOfResult;
 
 interface PositiveOutcome extends Outcome
 {