Merge pull request #10 from reactphp-parallel/fix-examples

Fix examples

Author: WyriHaximus

.github/workflows/ci.yml

@@ -48,10 +48,11 @@ jobs:
         if: matrix.composer == 'highest'
   examples:
     strategy:
+      fail-fast: false
       matrix:
         php: [7.4]
         composer: [lowest, current, highest]
-        example: [sleep, versions]
+        example: [echo, exception, json, sleep, versions]
     needs: composer-install
     runs-on: ubuntu-latest
     container:
@@ -63,6 +64,15 @@ jobs:
         with:
           path: ./vendor/
           key: ${{ matrix.composer }}-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
+      - name: Install Dependencies
+        run: (test -f vendor && true ) || composer update --prefer-lowest --no-progress --ansi --no-interaction --prefer-dist -o
+        if: matrix.composer == 'lowest'
+      - name: Install Dependencies
+        run: (test -f vendor && true ) || composer install --ansi --no-progress --no-interaction --prefer-dist -o
+        if: matrix.composer == 'current'
+      - name: Install Dependencies
+        run: (test -f vendor && true ) || composer update --ansi --no-progress --no-interaction --prefer-dist -o
+        if: matrix.composer == 'highest'
       - name: 'Run Example: ${{ matrix.example }}'
         run: php ./examples/${{ matrix.example }}.php
   qa:

README.md

@@ -25,9 +25,13 @@ second before returning an message. Upon receiving that message the mean thread
 closing the pool;
 
 ```php
+use React\EventLoop\Factory;
+use ReactParallel\EventLoop\EventLoopBridge;
+use ReactParallel\Pool\Infinite\Infinite;
+
 $loop = Factory::create();
-$finite = new Infinite($loop, 1);
-$finite->run(function () {
+$infinite = new Infinite($loop, new EventLoopBridge($loop), 1);
+$infinite->run(function () {
     sleep(1);
 
     return 'Hoi!';
@@ -40,7 +44,7 @@ $loop->run();
 
 ## License ##
 
-Copyright 2019 [Cees-Jan Kiewiet](http://wyrihaximus.net/)
+Copyright 2020 [Cees-Jan Kiewiet](http://wyrihaximus.net/)
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

composer.json

@@ -26,7 +26,6 @@
     "require-dev": {
         "bruli/php-value-objects": "^2.0",
         "moneyphp/money": "^3.2 || ^3.2.1",
-        "ocramius/package-versions": "^1.4",
         "wyrihaximus/iterator-or-array-to-array": "^1.1"
     },
     "config": {

composer.lock

@@ -12,11 +12,12 @@
     sleep(1);
 
     return 'Hoi!';
-})->then(function (string $message) use ($infinite) {
+})->then(function (string $message) use ($infinite, $loop) {
     echo $message, PHP_EOL;
     $infinite->close();
+    $loop->stop();
 });
 
 echo 'Loop::run()', PHP_EOL;
 $loop->run();
-echo 'Loop::done()', PHP_EOL;
+echo 'Loop::done()', PHP_EOL;

examples/echo.php

@@ -10,12 +10,13 @@
 
 $infinite = new Infinite($loop, new EventLoopBridge($loop), 1);
 
-$finite->run(function () {
+$infinite->run(function () {
     throw new RuntimeException('Whoops I did it again!');
 
     return 'We shouldn\'t reach this!';
-})->always(function () use ($finite) {
-    $finite->close();
+})->always(function () use ($infinite, $loop) {
+    $infinite->close();
+    $loop->stop();
 })->then(function (string $oops) {
     echo $oops, PHP_EOL;
 }, function (Throwable $error) {
@@ -24,4 +25,4 @@
 
 echo 'Loop::run()', PHP_EOL;
 $loop->run();
-echo 'Loop::done()', PHP_EOL;
+echo 'Loop::done()', PHP_EOL;

examples/exception.php

@@ -15,14 +15,14 @@
 $infinite = new Infinite($loop, new EventLoopBridge($loop), 1);
 
 $promises = [];
-$signalHandler = function () use ($finite, $loop) {
+$signalHandler = function () use ($infinite, $loop) {
     $loop->stop();
-    $finite->close();
+    $infinite->close();
 };
 
-$tick = function () use (&$promises, $finite, $loop, $signalHandler, $json, &$tick) {
+$tick = function () use (&$promises, $infinite, $loop, $signalHandler, $json, &$tick) {
     if (count($promises) < 1000) {
-        $promises[] = $finite->run(function($json) {
+        $promises[] = $infinite->run(function($json) {
             $json = json_decode($json, true);
             return md5(json_encode($json));
         }, [$json]);
@@ -32,9 +32,10 @@
 
     all($promises)->then(function ($v) {
         var_export($v);
-    })->always(function () use ($finite, $loop, $signalHandler) {
-        $finite->close();
+    })->always(function () use ($infinite, $loop, $signalHandler) {
+        $infinite->close();
         $loop->removeSignal(SIGINT, $signalHandler);
+        $loop->stop();
     })->done();
 
 };

examples/json.php

@@ -1,24 +1,25 @@
 <?php
 
-
 use React\EventLoop\Factory;
-use WyriHaximus\React\Parallel\Infinite;
+use ReactParallel\EventLoop\EventLoopBridge;
+use ReactParallel\Pool\Infinite\Infinite;
+
 use function React\Promise\all;
 use function WyriHaximus\iteratorOrArrayToArray;
 
 require dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
 $loop = Factory::create();
 
-$finite = new Infinite($loop, 0.1);
+$infinite = new Infinite($loop, new EventLoopBridge($loop), 0.1);
 
-$timer = $loop->addPeriodicTimer(1, function () use ($finite) {
-    var_export(iteratorOrArrayToArray($finite->info()));
+$timer = $loop->addPeriodicTimer(1, function () use ($infinite) {
+    var_export(iteratorOrArrayToArray($infinite->info()));
 });
 
 $promises = [];
 foreach (range(0, 250) as $i) {
-    $promises[] = $finite->run(function($sleep) {
+    $promises[] = $infinite->run(function($sleep) {
         sleep($sleep);
         return $sleep;
     }, [random_int(1, 13)])->then(function (int $sleep) use ($i) {
@@ -28,14 +29,15 @@
     });
 }
 
-$signalHandler = function () use ($finite, $loop) {
+$signalHandler = function () use ($infinite, $loop) {
     $loop->stop();
-    $finite->close();
+    $infinite->close();
 };
-all($promises)->then(function ($v) use ($finite, $loop, $signalHandler, $timer) {
-    $finite->close();
+all($promises)->then(function ($v) use ($infinite, $loop, $signalHandler, $timer) {
+    $infinite->close();
     $loop->removeSignal(SIGINT, $signalHandler);
     $loop->cancelTimer($timer);
+    $loop->stop();
 })->done();
 
 $loop->addSignal(SIGINT, $signalHandler);

examples/sleep.php

@@ -1,27 +1,26 @@
 <?php
 
-
-use PackageVersions\Versions;
+use Composer\InstalledVersions;
 use React\EventLoop\Factory;
 use ReactParallel\EventLoop\EventLoopBridge;
 use ReactParallel\Pool\Infinite\Infinite;
-use function WyriHaximus\iteratorOrArrayToArray;
 
 require dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
 $loop = Factory::create();
 
 $finite = new Infinite($loop, new EventLoopBridge($loop), 0.1);
 
-$loop->addTimer(1, function () use ($finite) {
+$loop->addTimer(1, function () use ($finite, $loop) {
     $finite->kill();
+    $loop->stop();
 });
 $finite->run(function (): array {
-    return Versions::VERSIONS;
+    return array_merge(...array_map(static fn (string $package): array => [$package => InstalledVersions::getPrettyVersion($package)], InstalledVersions::getInstalledPackages()));
 })->then(function (array $versions): void {
     var_export($versions);
 });
 
 echo 'Loop::run()', PHP_EOL;
 $loop->run();
-echo 'Loop::done()', PHP_EOL;
+echo 'Loop::done()', PHP_EOL;