From 1490faba003def88e76e65d007764306de3309c1 Mon Sep 17 00:00:00 2001 From: Mark Friedrich Date: Thu, 12 Dec 2019 21:27:12 +0100 Subject: [PATCH 1/5] - updated _Composer_ packages --- composer.json | 2 +- composer.lock | 136 +++++++++++++++++++++++++------------------------- 2 files changed, 70 insertions(+), 68 deletions(-) diff --git a/composer.json b/composer.json index 6e2c5f9..ade8f78 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "php-64bit": ">=7.1", "ext-json": "*", "cboden/ratchet": "0.4.x", - "react/promise-stream": "1.1.*", + "react/promise-stream": "1.2.*", "clue/ndjson-react": "1.0.*" }, "suggest": { diff --git a/composer.lock b/composer.lock index eb808df..dab0ec2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4644a460504bed39266426d4f32f8b79", + "content-hash": "6848c5d886aa54f3bd6d047b09783468", "packages": [ { "name": "cboden/ratchet", @@ -404,25 +404,24 @@ }, { "name": "react/dns", - "version": "v1.0.0", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/reactphp/dns.git", - "reference": "26c3e7b86f139217b6acc1bc160e2019787555fb" + "reference": "a214d90c2884dac18d0cac6176202f247b66d762" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/dns/zipball/26c3e7b86f139217b6acc1bc160e2019787555fb", - "reference": "26c3e7b86f139217b6acc1bc160e2019787555fb", + "url": "https://api.github.com/repos/reactphp/dns/zipball/a214d90c2884dac18d0cac6176202f247b66d762", + "reference": "a214d90c2884dac18d0cac6176202f247b66d762", "shasum": "" }, "require": { "php": ">=5.3.0", "react/cache": "^1.0 || ^0.6 || ^0.5", - "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5", - "react/promise": "^2.1 || ^1.2.1", - "react/promise-timer": "^1.2", - "react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4.5" + "react/event-loop": "^1.0 || ^0.5", + "react/promise": "^2.7 || ^1.2.1", + "react/promise-timer": "^1.2" }, "require-dev": { "clue/block-react": "^1.2", @@ -445,7 +444,7 @@ "dns-resolver", "reactphp" ], - "time": "2019-07-11T14:58:39+00:00" + "time": "2019-08-15T09:06:31+00:00" }, { "name": "react/event-loop", @@ -537,26 +536,26 @@ }, { "name": "react/promise-stream", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/reactphp/promise-stream.git", - "reference": "00e269d611e9c9a29356aef64c07f7e513e73dc9" + "reference": "6384d8b76cf7dcc44b0bf3343fb2b2928412d1fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise-stream/zipball/00e269d611e9c9a29356aef64c07f7e513e73dc9", - "reference": "00e269d611e9c9a29356aef64c07f7e513e73dc9", + "url": "https://api.github.com/repos/reactphp/promise-stream/zipball/6384d8b76cf7dcc44b0bf3343fb2b2928412d1fe", + "reference": "6384d8b76cf7dcc44b0bf3343fb2b2928412d1fe", "shasum": "" }, "require": { "php": ">=5.3", "react/promise": "^2.1 || ^1.2", - "react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4 || ^0.3" + "react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4.6" }, "require-dev": { "clue/block-react": "^1.0", - "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35", + "phpunit/phpunit": "^7.0 || ^6.4 || ^5.7 || ^4.8.35", "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3", "react/promise-timer": "^1.0" }, @@ -589,7 +588,7 @@ "stream", "unwrap" ], - "time": "2017-12-22T12:02:05+00:00" + "time": "2019-07-03T12:29:10+00:00" }, { "name": "react/promise-timer", @@ -739,31 +738,31 @@ }, { "name": "symfony/http-foundation", - "version": "v4.3.2", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "e1b507fcfa4e87d192281774b5ecd4265370180d" + "reference": "8bccc59e61b41963d14c3dbdb23181e5c932a1d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e1b507fcfa4e87d192281774b5ecd4265370180d", - "reference": "e1b507fcfa4e87d192281774b5ecd4265370180d", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8bccc59e61b41963d14c3dbdb23181e5c932a1d5", + "reference": "8bccc59e61b41963d14c3dbdb23181e5c932a1d5", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/mime": "^4.3", + "symfony/mime": "^4.3|^5.0", "symfony/polyfill-mbstring": "~1.1" }, "require-dev": { "predis/predis": "~1.0", - "symfony/expression-language": "~3.4|~4.0" + "symfony/expression-language": "^3.4|^4.0|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -790,35 +789,38 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-06-26T09:25:00+00:00" + "time": "2019-11-28T13:33:56+00:00" }, { "name": "symfony/mime", - "version": "v4.3.2", + "version": "v5.0.1", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b" + "reference": "0e6a4ced216e49d457eddcefb61132173a876d79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/ec2c5565de60e03f33d4296a655e3273f0ad1f8b", - "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b", + "url": "https://api.github.com/repos/symfony/mime/zipball/0e6a4ced216e49d457eddcefb61132173a876d79", + "reference": "0e6a4ced216e49d457eddcefb61132173a876d79", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": "^7.2.5", "symfony/polyfill-intl-idn": "^1.10", "symfony/polyfill-mbstring": "^1.0" }, + "conflict": { + "symfony/mailer": "<4.4" + }, "require-dev": { - "egulias/email-validator": "^2.0", - "symfony/dependency-injection": "~3.4|^4.1" + "egulias/email-validator": "^2.1.10", + "symfony/dependency-injection": "^4.4|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -849,20 +851,20 @@ "mime", "mime-type" ], - "time": "2019-06-04T09:22:54+00:00" + "time": "2019-11-30T14:12:50+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.11.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "c766e95bec706cdd89903b1eda8afab7d7a6b7af" + "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c766e95bec706cdd89903b1eda8afab7d7a6b7af", - "reference": "c766e95bec706cdd89903b1eda8afab7d7a6b7af", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6f9c239e61e1b0c9229a28ff89a812dc449c3d46", + "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46", "shasum": "" }, "require": { @@ -876,7 +878,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -892,13 +894,13 @@ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - }, { "name": "Laurent Bassin", "email": "laurent@bassin.info" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", @@ -911,20 +913,20 @@ "portable", "shim" ], - "time": "2019-03-04T13:44:35+00:00" + "time": "2019-11-27T13:56:44+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.11.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "fe5e94c604826c35a32fa832f35bd036b6799609" + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609", - "reference": "fe5e94c604826c35a32fa832f35bd036b6799609", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", "shasum": "" }, "require": { @@ -936,7 +938,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -970,20 +972,20 @@ "portable", "shim" ], - "time": "2019-02-06T07:57:58+00:00" + "time": "2019-11-27T14:18:11+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.11.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c" + "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/ab50dcf166d5f577978419edd37aa2bb8eabce0c", - "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/66fea50f6cb37a35eea048d75a7d99a45b586038", + "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038", "shasum": "" }, "require": { @@ -992,7 +994,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -1025,20 +1027,20 @@ "portable", "shim" ], - "time": "2019-02-06T07:57:58+00:00" + "time": "2019-11-27T13:56:44+00:00" }, { "name": "symfony/routing", - "version": "v4.3.2", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "2ef809021d72071c611b218c47a3bf3b17b7325e" + "reference": "51f3f20ad29329a0bdf5c0e2f722d3764b065273" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/2ef809021d72071c611b218c47a3bf3b17b7325e", - "reference": "2ef809021d72071c611b218c47a3bf3b17b7325e", + "url": "https://api.github.com/repos/symfony/routing/zipball/51f3f20ad29329a0bdf5c0e2f722d3764b065273", + "reference": "51f3f20ad29329a0bdf5c0e2f722d3764b065273", "shasum": "" }, "require": { @@ -1052,11 +1054,11 @@ "require-dev": { "doctrine/annotations": "~1.2", "psr/log": "~1.0", - "symfony/config": "~4.2", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/expression-language": "~3.4|~4.0", - "symfony/http-foundation": "~3.4|~4.0", - "symfony/yaml": "~3.4|~4.0" + "symfony/config": "^4.2|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/expression-language": "^3.4|^4.0|^5.0", + "symfony/http-foundation": "^3.4|^4.0|^5.0", + "symfony/yaml": "^3.4|^4.0|^5.0" }, "suggest": { "doctrine/annotations": "For using the annotation loader", @@ -1068,7 +1070,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1101,7 +1103,7 @@ "uri", "url" ], - "time": "2019-06-26T13:54:39+00:00" + "time": "2019-12-01T08:39:58+00:00" } ], "packages-dev": [], From 2a2808c747795d65348734695b7427c3e4e120bc Mon Sep 17 00:00:00 2001 From: Mark Friedrich Date: Fri, 13 Dec 2019 09:13:07 +0100 Subject: [PATCH 2/5] - Compatibility changes for _PHP_ `v7.4` --- app/Component/MapUpdate.php | 4 ++-- app/Log/Store.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Component/MapUpdate.php b/app/Component/MapUpdate.php index 62852a3..bc622ab 100644 --- a/app/Component/MapUpdate.php +++ b/app/Component/MapUpdate.php @@ -319,7 +319,7 @@ private function subscribe(ConnectionInterface $conn, array $subscribeData) : vo sort($changedSubscriptionsMapIds, SORT_NUMERIC); $this->log(['debug', 'info'], $conn, __FUNCTION__, - sprintf(static::LOG_TEXT_SUBSCRIBE, $characterId, implode($changedSubscriptionsMapIds, ',')) + sprintf(static::LOG_TEXT_SUBSCRIBE, $characterId, implode(',', $changedSubscriptionsMapIds)) ); // broadcast all active subscriptions to subscribed connections ------------------------------------------- @@ -386,7 +386,7 @@ private function unSubscribeCharacterId(int $characterId, ?ConnectionInterface $ sort($changedSubscriptionsMapIds, SORT_NUMERIC); $this->log(['debug', 'info'], $conn, __FUNCTION__, - sprintf(static::LOG_TEXT_UNSUBSCRIBE, $characterId, implode($changedSubscriptionsMapIds, ',')) + sprintf(static::LOG_TEXT_UNSUBSCRIBE, $characterId, implode(',', $changedSubscriptionsMapIds)) ); // broadcast all active subscriptions to subscribed connections ------------------------------------------- diff --git a/app/Log/Store.php b/app/Log/Store.php index 6b35335..28ffbf6 100644 --- a/app/Log/Store.php +++ b/app/Log/Store.php @@ -202,11 +202,11 @@ private function echoLog(array $logData) : void { $logData['remoteAddress'] . ($logData['resourceId'] ? ' #' . $logData['resourceId'] : ''), self::$colors->getColoredString($logData['fileName'] . ' line ' . $logData['lineNumber'], 'dark_gray'), self::$colors->getColoredString($logData['function'] . '()' . (($logData['function'] !== $logData['action']) ? ' [' . $logData['action'] . ']' : ''), 'dark_gray'), - implode((array)$logData['logTypes'], ','), + implode(',', (array)$logData['logTypes']), self::$colors->getColoredString($logData['message'], 'light_purple') ]; - echo implode(array_filter($data), ' | ') . PHP_EOL; + echo implode(' | ', array_filter($data)) . PHP_EOL; } /** From a70806d3f437b6f4919f3397c1aded22fef5b8c9 Mon Sep 17 00:00:00 2001 From: Mark Friedrich Date: Fri, 6 Mar 2020 15:53:26 +0100 Subject: [PATCH 3/5] =?UTF-8?q?-=20Improved=20PHP=C2=B4s=20`error=5Freport?= =?UTF-8?q?ing()`.=20Level=20of=20reporting=20now=20relates=20to=20`-debug?= =?UTF-8?q?`=20CLI=20option,=20closed=20https://github.com/exodus4d/pathfi?= =?UTF-8?q?nder/issues/901=20-=20Upgraded=20some=20=5FComposer=5F=20depend?= =?UTF-8?q?encies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd.php | 17 ++++++- composer.lock | 133 +++++++++++++++++++++++++------------------------- 2 files changed, 82 insertions(+), 68 deletions(-) diff --git a/cmd.php b/cmd.php index 5bf6508..a4ebb32 100644 --- a/cmd.php +++ b/cmd.php @@ -56,9 +56,24 @@ } $data[] = ''; - echo implode($data, PHP_EOL) . PHP_EOL; + echo implode(PHP_EOL, $data) . PHP_EOL; }; + /** + * set error reporting based on debug option value + * @param int $debug + */ + $setErrorReporting = function(int $debug){ + switch($debug){ + case 0: error_reporting(0); break; // Turn off all error reporting + case 1: error_reporting(E_ERROR); break; // Errors only + case 2: error_reporting(E_ALL & ~E_NOTICE); break; // Report all errors except E_NOTICE + default: error_reporting(E_ALL); + } + }; + + $setErrorReporting($options['debug']); + if($options['debug']){ // print if -debug > 0 $showHelp($longOpts, $options); diff --git a/composer.lock b/composer.lock index dab0ec2..f104789 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "cboden/ratchet", - "version": "v0.4.1", + "version": "v0.4.2", "source": { "type": "git", "url": "https://github.com/ratchetphp/Ratchet.git", - "reference": "0d31f3a8ad4795fd48397712709e55cd07f51360" + "reference": "57721e1f184f9e29378fc5363867c47ddda743fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ratchetphp/Ratchet/zipball/0d31f3a8ad4795fd48397712709e55cd07f51360", - "reference": "0d31f3a8ad4795fd48397712709e55cd07f51360", + "url": "https://api.github.com/repos/ratchetphp/Ratchet/zipball/57721e1f184f9e29378fc5363867c47ddda743fd", + "reference": "57721e1f184f9e29378fc5363867c47ddda743fd", "shasum": "" }, "require": { @@ -25,8 +25,8 @@ "php": ">=5.4.2", "ratchet/rfc6455": "^0.2", "react/socket": "^1.0 || ^0.8 || ^0.7 || ^0.6 || ^0.5", - "symfony/http-foundation": "^2.6|^3.0|^4.0", - "symfony/routing": "^2.6|^3.0|^4.0" + "symfony/http-foundation": "^2.6|^3.0|^4.0|^5.0", + "symfony/routing": "^2.6|^3.0|^4.0|^5.0" }, "require-dev": { "phpunit/phpunit": "~4.8" @@ -57,7 +57,7 @@ "sockets", "websocket" ], - "time": "2017-12-12T00:49:31+00:00" + "time": "2020-01-27T23:08:40+00:00" }, { "name": "clue/ndjson-react", @@ -315,16 +315,16 @@ }, { "name": "ratchet/rfc6455", - "version": "v0.2.5", + "version": "v0.2.6", "source": { "type": "git", "url": "https://github.com/ratchetphp/RFC6455.git", - "reference": "c62f7cd95ffbb6e94fd657be694fc7372ecd6e62" + "reference": "879e48c840f8dbc296d68d6a5030673df79bd916" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ratchetphp/RFC6455/zipball/c62f7cd95ffbb6e94fd657be694fc7372ecd6e62", - "reference": "c62f7cd95ffbb6e94fd657be694fc7372ecd6e62", + "url": "https://api.github.com/repos/ratchetphp/RFC6455/zipball/879e48c840f8dbc296d68d6a5030673df79bd916", + "reference": "879e48c840f8dbc296d68d6a5030673df79bd916", "shasum": "" }, "require": { @@ -333,8 +333,7 @@ }, "require-dev": { "phpunit/phpunit": "4.8.*", - "react/http": "^0.4.1", - "react/socket-client": "^0.4.3" + "react/socket": "^1.3" }, "type": "library", "autoload": { @@ -360,7 +359,7 @@ "rfc6455", "websocket" ], - "time": "2019-03-10T17:10:42+00:00" + "time": "2019-12-15T10:18:18+00:00" }, { "name": "react/cache", @@ -448,16 +447,16 @@ }, { "name": "react/event-loop", - "version": "v1.1.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/reactphp/event-loop.git", - "reference": "a0ecac955c67b57c40fe4a1b88a7cca1b58c982d" + "reference": "6d24de090cd59cfc830263cfba965be77b563c13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/event-loop/zipball/a0ecac955c67b57c40fe4a1b88a7cca1b58c982d", - "reference": "a0ecac955c67b57c40fe4a1b88a7cca1b58c982d", + "url": "https://api.github.com/repos/reactphp/event-loop/zipball/6d24de090cd59cfc830263cfba965be77b563c13", + "reference": "6d24de090cd59cfc830263cfba965be77b563c13", "shasum": "" }, "require": { @@ -486,7 +485,7 @@ "asynchronous", "event-loop" ], - "time": "2019-02-07T16:19:49+00:00" + "time": "2020-01-01T18:39:52+00:00" }, { "name": "react/promise", @@ -738,31 +737,31 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.1", + "version": "v5.0.5", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "8bccc59e61b41963d14c3dbdb23181e5c932a1d5" + "reference": "6f9c2ba72f4295d7ce6cf9f79dbb18036291d335" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8bccc59e61b41963d14c3dbdb23181e5c932a1d5", - "reference": "8bccc59e61b41963d14c3dbdb23181e5c932a1d5", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6f9c2ba72f4295d7ce6cf9f79dbb18036291d335", + "reference": "6f9c2ba72f4295d7ce6cf9f79dbb18036291d335", "shasum": "" }, "require": { - "php": "^7.1.3", - "symfony/mime": "^4.3|^5.0", + "php": "^7.2.5", + "symfony/mime": "^4.4|^5.0", "symfony/polyfill-mbstring": "~1.1" }, "require-dev": { "predis/predis": "~1.0", - "symfony/expression-language": "^3.4|^4.0|^5.0" + "symfony/expression-language": "^4.4|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -789,20 +788,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-11-28T13:33:56+00:00" + "time": "2020-02-14T07:43:07+00:00" }, { "name": "symfony/mime", - "version": "v5.0.1", + "version": "v5.0.5", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "0e6a4ced216e49d457eddcefb61132173a876d79" + "reference": "9b3e5b5e58c56bbd76628c952d2b78556d305f3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/0e6a4ced216e49d457eddcefb61132173a876d79", - "reference": "0e6a4ced216e49d457eddcefb61132173a876d79", + "url": "https://api.github.com/repos/symfony/mime/zipball/9b3e5b5e58c56bbd76628c952d2b78556d305f3c", + "reference": "9b3e5b5e58c56bbd76628c952d2b78556d305f3c", "shasum": "" }, "require": { @@ -851,26 +850,26 @@ "mime", "mime-type" ], - "time": "2019-11-30T14:12:50+00:00" + "time": "2020-02-04T09:41:09+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.13.1", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46" + "reference": "6842f1a39cf7d580655688069a03dd7cd83d244a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6f9c239e61e1b0c9229a28ff89a812dc449c3d46", - "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6842f1a39cf7d580655688069a03dd7cd83d244a", + "reference": "6842f1a39cf7d580655688069a03dd7cd83d244a", "shasum": "" }, "require": { "php": ">=5.3.3", "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php72": "^1.9" + "symfony/polyfill-php72": "^1.10" }, "suggest": { "ext-intl": "For best performance" @@ -878,7 +877,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -913,20 +912,20 @@ "portable", "shim" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-01-17T12:01:36+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.13.1", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" + "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/34094cfa9abe1f0f14f48f490772db7a775559f2", + "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2", "shasum": "" }, "require": { @@ -938,7 +937,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -972,20 +971,20 @@ "portable", "shim" ], - "time": "2019-11-27T14:18:11+00:00" + "time": "2020-01-13T11:15:53+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.13.1", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038" + "reference": "46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/66fea50f6cb37a35eea048d75a7d99a45b586038", - "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf", + "reference": "46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf", "shasum": "" }, "require": { @@ -994,7 +993,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -1027,38 +1026,38 @@ "portable", "shim" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-01-13T11:15:53+00:00" }, { "name": "symfony/routing", - "version": "v4.4.1", + "version": "v5.0.5", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "51f3f20ad29329a0bdf5c0e2f722d3764b065273" + "reference": "d6ca39fd05c1902bf34d724ba06fb8044a0b46de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/51f3f20ad29329a0bdf5c0e2f722d3764b065273", - "reference": "51f3f20ad29329a0bdf5c0e2f722d3764b065273", + "url": "https://api.github.com/repos/symfony/routing/zipball/d6ca39fd05c1902bf34d724ba06fb8044a0b46de", + "reference": "d6ca39fd05c1902bf34d724ba06fb8044a0b46de", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^7.2.5" }, "conflict": { - "symfony/config": "<4.2", - "symfony/dependency-injection": "<3.4", - "symfony/yaml": "<3.4" + "symfony/config": "<5.0", + "symfony/dependency-injection": "<4.4", + "symfony/yaml": "<4.4" }, "require-dev": { "doctrine/annotations": "~1.2", "psr/log": "~1.0", - "symfony/config": "^4.2|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/http-foundation": "^3.4|^4.0|^5.0", - "symfony/yaml": "^3.4|^4.0|^5.0" + "symfony/config": "^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/expression-language": "^4.4|^5.0", + "symfony/http-foundation": "^4.4|^5.0", + "symfony/yaml": "^4.4|^5.0" }, "suggest": { "doctrine/annotations": "For using the annotation loader", @@ -1070,7 +1069,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -1103,7 +1102,7 @@ "uri", "url" ], - "time": "2019-12-01T08:39:58+00:00" + "time": "2020-02-25T14:24:11+00:00" } ], "packages-dev": [], From e45575a7f1fc89e7108b0dabe4e90fe9663c043b Mon Sep 17 00:00:00 2001 From: Mark Friedrich Date: Fri, 20 Mar 2020 18:00:13 +0100 Subject: [PATCH 4/5] - Upgraded some _Composer_ dependencies --- composer.json | 2 +- composer.lock | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index ade8f78..da4cf83 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "ext-json": "*", "cboden/ratchet": "0.4.x", "react/promise-stream": "1.2.*", - "clue/ndjson-react": "1.0.*" + "clue/ndjson-react": "1.1.*" }, "suggest": { "ext-event": "If installed, 'ExtEventLoop' class will get used as default event loop. Better performance. https://pecl.php.net/package/event" diff --git a/composer.lock b/composer.lock index f104789..712c634 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6848c5d886aa54f3bd6d047b09783468", + "content-hash": "3ab6b63f00cc99da3ef0ca2500f96d9b", "packages": [ { "name": "cboden/ratchet", @@ -61,16 +61,16 @@ }, { "name": "clue/ndjson-react", - "version": "v1.0.0", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/clue/reactphp-ndjson.git", - "reference": "c41a30e7f888dc0e4af18881b2c9ab260ba8d6ce" + "reference": "767ec9543945802b5766fab0da4520bf20626f66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/clue/reactphp-ndjson/zipball/c41a30e7f888dc0e4af18881b2c9ab260ba8d6ce", - "reference": "c41a30e7f888dc0e4af18881b2c9ab260ba8d6ce", + "url": "https://api.github.com/repos/clue/reactphp-ndjson/zipball/767ec9543945802b5766fab0da4520bf20626f66", + "reference": "767ec9543945802b5766fab0da4520bf20626f66", "shasum": "" }, "require": { @@ -78,7 +78,7 @@ "react/stream": "^1.0 || ^0.7 || ^0.6" }, "require-dev": { - "phpunit/phpunit": "^6.0 || ^5.7 || ^4.8.35", + "phpunit/phpunit": "^7.0 || ^6.0 || ^5.7 || ^4.8.35", "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3" }, "type": "library", @@ -94,7 +94,7 @@ "authors": [ { "name": "Christian Lück", - "email": "christian@lueck.tv" + "email": "christian@clue.engineering" } ], "description": "Streaming newline-delimited JSON (NDJSON) parser and encoder for ReactPHP.", @@ -107,7 +107,7 @@ "reactphp", "streaming" ], - "time": "2018-05-17T15:31:04+00:00" + "time": "2020-02-04T11:48:52+00:00" }, { "name": "evenement/evenement", @@ -644,30 +644,31 @@ }, { "name": "react/socket", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/reactphp/socket.git", - "reference": "10f0629ec83ea0fa22597f348623f554227e3ca0" + "reference": "97522e24987365e1ed873f0f4884900747a668e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/socket/zipball/10f0629ec83ea0fa22597f348623f554227e3ca0", - "reference": "10f0629ec83ea0fa22597f348623f554227e3ca0", + "url": "https://api.github.com/repos/reactphp/socket/zipball/97522e24987365e1ed873f0f4884900747a668e0", + "reference": "97522e24987365e1ed873f0f4884900747a668e0", "shasum": "" }, "require": { "evenement/evenement": "^3.0 || ^2.0 || ^1.0", "php": ">=5.3.0", - "react/dns": "^1.0 || ^0.4.13", - "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5", + "react/dns": "^1.1", + "react/event-loop": "^1.0 || ^0.5", "react/promise": "^2.6.0 || ^1.2.1", "react/promise-timer": "^1.4.0", "react/stream": "^1.1" }, "require-dev": { "clue/block-react": "^1.2", - "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35" + "phpunit/phpunit": "^7.5 || ^6.4 || ^5.7 || ^4.8.35", + "react/promise-stream": "^1.2" }, "type": "library", "autoload": { @@ -687,7 +688,7 @@ "reactphp", "stream" ], - "time": "2019-07-10T10:11:14+00:00" + "time": "2020-03-12T12:15:14+00:00" }, { "name": "react/stream", From 395c22aef81ecf8b69cda2ccaeb4e93df62f652a Mon Sep 17 00:00:00 2001 From: Mark Friedrich Date: Fri, 20 Mar 2020 18:28:25 +0100 Subject: [PATCH 5/5] Updated README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 045d3c7..a404e00 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ ## WebSocket server for [Pathfinder](https://github.com/exodus4d/pathfinder) ### Requirements -- _PHP_ **(≥ v7.1)** -- A working instance of *[Pathfinder](https://github.com/exodus4d/pathfinder)* **(≥ v1.2.0)** +- _PHP_ (≥ v7.1) +- A working instance of *[Pathfinder](https://github.com/exodus4d/pathfinder)* (≥ v2.0.0-rc.1) - [_Composer_](https://getcomposer.org/download/) to install packages for the WebSocket server ### Install -1. Checkout this project in a **new** folder (NOT the install for _Pathfinder_ itself) e.g. `/var/www/websocket.pathfinder` +1. Checkout this project in a **new** folder e.g. `/var/www/websocket.pathfinder` 1. Install [_Composer_](https://getcomposer.org/download/) 2. Install Composer dependencies from `composer.json` file: - `$ cd /var/www/websocket.pathfinder`