From d8334d93e0eaeddad267e43dc1a88242d11159c5 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 2 Oct 2016 11:29:34 -0700 Subject: [PATCH 1/5] Update to latest versions. --- composer.json | 4 +- composer.lock | 609 ++++++++++++++++++++++++-------------------------- 2 files changed, 297 insertions(+), 316 deletions(-) diff --git a/composer.json b/composer.json index 66561dc..7e57b85 100644 --- a/composer.json +++ b/composer.json @@ -6,8 +6,8 @@ "type": "library", "require": { "php": ">=5.5.9", - "laravel/framework": "5.2.*", - "cboden/ratchet": "^0.3.4", + "laravel/framework": "5.3.*", + "cboden/ratchet": "^0.3", "graham-campbell/throttle": "^5.2", "react/zmq": "0.2.*|0.3.*" }, diff --git a/composer.lock b/composer.lock index a5cfb4f..8712dc5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "a3603cb2574f7d650fb5f17a4f3d0360", - "content-hash": "82b2860b4853586422c63dbc44344bc3", + "hash": "9034fb10ed1fccfcfef545884b723829", + "content-hash": "24444aabfca2f915d323e02a8fe3eb23", "packages": [ { "name": "cboden/ratchet", - "version": "v0.3.4", + "version": "v0.3.5", "source": { "type": "git", "url": "https://github.com/ratchetphp/Ratchet.git", - "reference": "a177819dd0e6eb1d7e4192aeafadfa43a84867f1" + "reference": "b5ccecad9390db85d2c8df7cbeb047292fbbf4b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ratchetphp/Ratchet/zipball/a177819dd0e6eb1d7e4192aeafadfa43a84867f1", - "reference": "a177819dd0e6eb1d7e4192aeafadfa43a84867f1", + "url": "https://api.github.com/repos/ratchetphp/Ratchet/zipball/b5ccecad9390db85d2c8df7cbeb047292fbbf4b8", + "reference": "b5ccecad9390db85d2c8df7cbeb047292fbbf4b8", "shasum": "" }, "require": { @@ -53,7 +53,7 @@ "server", "sockets" ], - "time": "2015-12-23 15:06:48" + "time": "2016-05-25 12:55:03" }, { "name": "classpreloader/classpreloader", @@ -109,50 +109,6 @@ ], "time": "2015-11-09 22:51:51" }, - { - "name": "clue/redis-protocol", - "version": "v0.3.0", - "source": { - "type": "git", - "url": "https://github.com/clue/php-redis-protocol.git", - "reference": "2ffcdfa281b1084f666340e13f05a1d26d35ed26" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/clue/php-redis-protocol/zipball/2ffcdfa281b1084f666340e13f05a1d26d35ed26", - "reference": "2ffcdfa281b1084f666340e13f05a1d26d35ed26", - "shasum": "" - }, - "require": { - "php": ">=5.3" - }, - "type": "library", - "autoload": { - "psr-0": { - "Clue\\Redis\\Protocol": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Christian Lück", - "email": "christian@lueck.tv" - } - ], - "description": "A streaming redis wire protocol parser and serializer implementation in PHP", - "homepage": "https://github.com/clue/redis-protocol", - "keywords": [ - "parser", - "protocol", - "redis", - "serializer", - "streaming" - ], - "time": "2014-01-26 23:49:05" - }, { "name": "dnoegel/php-xdg-base-dir", "version": "0.1", @@ -709,16 +665,16 @@ }, { "name": "laravel/framework", - "version": "v5.2.31", + "version": "v5.3.15", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "2fa2797604bf54b06faf7bb139a9fc0d66826fea" + "reference": "f034a02f38db77d4b0b3e89942394cae456a627f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/2fa2797604bf54b06faf7bb139a9fc0d66826fea", - "reference": "2fa2797604bf54b06faf7bb139a9fc0d66826fea", + "url": "https://api.github.com/repos/laravel/framework/zipball/f034a02f38db77d4b0b3e89942394cae456a627f", + "reference": "f034a02f38db77d4b0b3e89942394cae456a627f", "shasum": "" }, "require": { @@ -731,20 +687,20 @@ "monolog/monolog": "~1.11", "mtdowling/cron-expression": "~1.0", "nesbot/carbon": "~1.20", - "paragonie/random_compat": "~1.4", - "php": ">=5.5.9", + "paragonie/random_compat": "~1.4|~2.0", + "php": ">=5.6.4", "psy/psysh": "0.7.*", + "ramsey/uuid": "~3.0", "swiftmailer/swiftmailer": "~5.1", - "symfony/console": "2.8.*|3.0.*", - "symfony/debug": "2.8.*|3.0.*", - "symfony/finder": "2.8.*|3.0.*", - "symfony/http-foundation": "2.8.*|3.0.*", - "symfony/http-kernel": "2.8.*|3.0.*", - "symfony/polyfill-php56": "~1.0", - "symfony/process": "2.8.*|3.0.*", - "symfony/routing": "2.8.*|3.0.*", - "symfony/translation": "2.8.*|3.0.*", - "symfony/var-dumper": "2.8.*|3.0.*", + "symfony/console": "3.1.*", + "symfony/debug": "3.1.*", + "symfony/finder": "3.1.*", + "symfony/http-foundation": "3.1.*", + "symfony/http-kernel": "3.1.*", + "symfony/process": "3.1.*", + "symfony/routing": "3.1.*", + "symfony/translation": "3.1.*", + "symfony/var-dumper": "3.1.*", "vlucas/phpdotenv": "~2.2" }, "replace": { @@ -766,6 +722,7 @@ "illuminate/http": "self.version", "illuminate/log": "self.version", "illuminate/mail": "self.version", + "illuminate/notifications": "self.version", "illuminate/pagination": "self.version", "illuminate/pipeline": "self.version", "illuminate/queue": "self.version", @@ -775,16 +732,17 @@ "illuminate/support": "self.version", "illuminate/translation": "self.version", "illuminate/validation": "self.version", - "illuminate/view": "self.version" + "illuminate/view": "self.version", + "tightenco/collect": "self.version" }, "require-dev": { "aws/aws-sdk-php": "~3.0", "mockery/mockery": "~0.9.4", "pda/pheanstalk": "~3.0", - "phpunit/phpunit": "~4.1", + "phpunit/phpunit": "~5.4", "predis/predis": "~1.0", - "symfony/css-selector": "2.8.*|3.0.*", - "symfony/dom-crawler": "2.8.*|3.0.*" + "symfony/css-selector": "3.1.*", + "symfony/dom-crawler": "3.1.*" }, "suggest": { "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).", @@ -796,20 +754,17 @@ "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).", "predis/predis": "Required to use the redis cache and queue drivers (~1.0).", "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).", - "symfony/css-selector": "Required to use some of the crawler integration testing tools (2.8.*|3.0.*).", - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (2.8.*|3.0.*).", + "symfony/css-selector": "Required to use some of the crawler integration testing tools (3.1.*).", + "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (3.1.*).", "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.2-dev" + "dev-master": "5.3-dev" } }, "autoload": { - "classmap": [ - "src/Illuminate/Queue/IlluminateQueueClosure.php" - ], "files": [ "src/Illuminate/Foundation/helpers.php", "src/Illuminate/Support/helpers.php" @@ -825,29 +780,29 @@ "authors": [ { "name": "Taylor Otwell", - "email": "taylorotwell@gmail.com" + "email": "taylor@laravel.com" } ], "description": "The Laravel Framework.", - "homepage": "http://laravel.com", + "homepage": "https://laravel.com", "keywords": [ "framework", "laravel" ], - "time": "2016-04-27 13:02:09" + "time": "2016-09-29 22:13:17" }, { "name": "league/flysystem", - "version": "1.0.22", + "version": "1.0.27", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "bd73a91703969a2d20ab4bfbf971d6c2cbe36612" + "reference": "50e2045ed70a7e75a5e30bc3662904f3b67af8a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/bd73a91703969a2d20ab4bfbf971d6c2cbe36612", - "reference": "bd73a91703969a2d20ab4bfbf971d6c2cbe36612", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/50e2045ed70a7e75a5e30bc3662904f3b67af8a9", + "reference": "50e2045ed70a7e75a5e30bc3662904f3b67af8a9", "shasum": "" }, "require": { @@ -860,7 +815,7 @@ "ext-fileinfo": "*", "mockery/mockery": "~0.9", "phpspec/phpspec": "^2.2", - "phpunit/phpunit": "~4.8 || ~5.0" + "phpunit/phpunit": "~4.8" }, "suggest": { "ext-fileinfo": "Required for MimeType", @@ -917,20 +872,20 @@ "sftp", "storage" ], - "time": "2016-04-28 06:53:12" + "time": "2016-08-10 08:55:11" }, { "name": "monolog/monolog", - "version": "1.19.0", + "version": "1.21.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "5f56ed5212dc509c8dc8caeba2715732abb32dbf" + "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5f56ed5212dc509c8dc8caeba2715732abb32dbf", - "reference": "5f56ed5212dc509c8dc8caeba2715732abb32dbf", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952", + "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952", "shasum": "" }, "require": { @@ -949,8 +904,8 @@ "php-console/php-console": "^3.1.3", "phpunit/phpunit": "~4.5", "phpunit/phpunit-mock-objects": "2.3.0", - "raven/raven": "^0.13", "ruflin/elastica": ">=0.90 <3.0", + "sentry/sentry": "^0.13", "swiftmailer/swiftmailer": "~5.3" }, "suggest": { @@ -962,9 +917,9 @@ "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", "php-console/php-console": "Allow sending log messages to Google Chrome", - "raven/raven": "Allow sending log messages to a Sentry server", "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server" + "ruflin/elastica": "Allow sending log messages to an Elastic Search server", + "sentry/sentry": "Allow sending log messages to a Sentry server" }, "type": "library", "extra": { @@ -995,7 +950,7 @@ "logging", "psr-3" ], - "time": "2016-04-12 18:29:35" + "time": "2016-07-29 03:23:52" }, { "name": "mtdowling/cron-expression", @@ -1090,16 +1045,16 @@ }, { "name": "nikic/php-parser", - "version": "v2.1.0", + "version": "v2.1.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "47b254ea51f1d6d5dc04b9b299e88346bf2369e3" + "reference": "4dd659edadffdc2143e4753df655d866dbfeedf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/47b254ea51f1d6d5dc04b9b299e88346bf2369e3", - "reference": "47b254ea51f1d6d5dc04b9b299e88346bf2369e3", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4dd659edadffdc2143e4753df655d866dbfeedf0", + "reference": "4dd659edadffdc2143e4753df655d866dbfeedf0", "shasum": "" }, "require": { @@ -1137,20 +1092,20 @@ "parser", "php" ], - "time": "2016-04-19 13:41:41" + "time": "2016-09-16 12:04:44" }, { "name": "paragonie/random_compat", - "version": "v1.4.1", + "version": "v2.0.2", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "c7e26a21ba357863de030f0b9e701c7d04593774" + "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/c7e26a21ba357863de030f0b9e701c7d04593774", - "reference": "c7e26a21ba357863de030f0b9e701c7d04593774", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/088c04e2f261c33bed6ca5245491cfca69195ccf", + "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf", "shasum": "" }, "require": { @@ -1185,128 +1140,34 @@ "pseudorandom", "random" ], - "time": "2016-03-18 20:34:03" + "time": "2016-04-03 06:00:07" }, { - "name": "predis/predis", - "version": "v1.0.3", + "name": "psr/log", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/nrk/predis.git", - "reference": "84060b9034d756b4d79641667d7f9efe1aeb8e04" + "url": "https://github.com/php-fig/log.git", + "reference": "5277094ed527a1c4477177d102fe4c53551953e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nrk/predis/zipball/84060b9034d756b4d79641667d7f9efe1aeb8e04", - "reference": "84060b9034d756b4d79641667d7f9efe1aeb8e04", + "url": "https://api.github.com/repos/php-fig/log/zipball/5277094ed527a1c4477177d102fe4c53551953e0", + "reference": "5277094ed527a1c4477177d102fe4c53551953e0", "shasum": "" }, "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "suggest": { - "ext-curl": "Allows access to Webdis when paired with phpiredis", - "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol" + "php": ">=5.3.0" }, "type": "library", - "autoload": { - "psr-4": { - "Predis\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Daniele Alessandri", - "email": "suppakilla@gmail.com", - "homepage": "http://clorophilla.net" + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" } - ], - "description": "Flexible and feature-complete PHP client library for Redis", - "homepage": "http://github.com/nrk/predis", - "keywords": [ - "nosql", - "predis", - "redis" - ], - "time": "2015-07-30 18:34:15" - }, - { - "name": "predis/predis-async", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/nrk/predis-async.git", - "reference": "b278b9efc40386149c29205224a617d3024cd559" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nrk/predis-async/zipball/b278b9efc40386149c29205224a617d3024cd559", - "reference": "b278b9efc40386149c29205224a617d3024cd559", - "shasum": "" - }, - "require": { - "clue/redis-protocol": "0.3.*", - "php": ">=5.4.0", - "predis/predis": "~1.0", - "react/event-loop": "0.4.*" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "suggest": { - "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol" }, - "type": "library", "autoload": { "psr-4": { - "Predis\\Async\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Daniele Alessandri", - "email": "suppakilla@gmail.com", - "homepage": "http://clorophilla.net" - } - ], - "description": "Asynchronous version of Predis", - "homepage": "http://github.com/nrk/predis-async", - "keywords": [ - "nosql", - "predis", - "redis" - ], - "time": "2014-10-26 13:24:49" - }, - { - "name": "psr/log", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b", - "shasum": "" - }, - "type": "library", - "autoload": { - "psr-0": { - "Psr\\Log\\": "" + "Psr\\Log\\": "Psr/Log/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1320,12 +1181,13 @@ } ], "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", "keywords": [ "log", "psr", "psr-3" ], - "time": "2012-12-21 11:40:51" + "time": "2016-09-19 16:02:08" }, { "name": "psy/psysh", @@ -1399,6 +1261,86 @@ ], "time": "2016-03-09 05:03:14" }, + { + "name": "ramsey/uuid", + "version": "3.5.1", + "source": { + "type": "git", + "url": "https://github.com/ramsey/uuid.git", + "reference": "a07797b986671b0dc823885a81d5e3516b931599" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/a07797b986671b0dc823885a81d5e3516b931599", + "reference": "a07797b986671b0dc823885a81d5e3516b931599", + "shasum": "" + }, + "require": { + "paragonie/random_compat": "^1.0|^2.0", + "php": ">=5.4" + }, + "replace": { + "rhumsaa/uuid": "self.version" + }, + "require-dev": { + "apigen/apigen": "^4.1", + "codeception/aspect-mock": "1.0.0", + "goaop/framework": "1.0.0-alpha.2", + "ircmaxell/random-lib": "^1.1", + "jakub-onderka/php-parallel-lint": "^0.9.0", + "mockery/mockery": "^0.9.4", + "moontoast/math": "^1.1", + "phpunit/phpunit": "^4.7|>=5.0 <5.4", + "satooshi/php-coveralls": "^0.6.1", + "squizlabs/php_codesniffer": "^2.3" + }, + "suggest": { + "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator", + "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator", + "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter", + "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).", + "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid", + "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Ramsey\\Uuid\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marijn Huizendveld", + "email": "marijn.huizendveld@gmail.com" + }, + { + "name": "Thibaud Fabre", + "email": "thibaud@aztech.io" + }, + { + "name": "Ben Ramsey", + "email": "ben@benramsey.com", + "homepage": "https://benramsey.com" + } + ], + "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", + "homepage": "https://github.com/ramsey/uuid", + "keywords": [ + "guid", + "identifier", + "uuid" + ], + "time": "2016-10-02 15:51:17" + }, { "name": "react/event-loop", "version": "v0.4.2", @@ -1486,16 +1428,16 @@ }, { "name": "react/stream", - "version": "v0.4.3", + "version": "v0.4.4", "source": { "type": "git", "url": "https://github.com/reactphp/stream.git", - "reference": "305b2328d2a2e157bc13b61a0f5c6e41b666b188" + "reference": "fcc9e7cea126962cff303c90c05e2efdcec09a27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/stream/zipball/305b2328d2a2e157bc13b61a0f5c6e41b666b188", - "reference": "305b2328d2a2e157bc13b61a0f5c6e41b666b188", + "url": "https://api.github.com/repos/reactphp/stream/zipball/fcc9e7cea126962cff303c90c05e2efdcec09a27", + "reference": "fcc9e7cea126962cff303c90c05e2efdcec09a27", "shasum": "" }, "require": { @@ -1503,6 +1445,7 @@ "php": ">=5.3.8" }, "require-dev": { + "clue/stream-filter": "~1.2", "react/event-loop": "^0.4|^0.3", "react/promise": "^2.0|^1.0" }, @@ -1511,11 +1454,6 @@ "react/promise": "^2.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.5-dev" - } - }, "autoload": { "psr-4": { "React\\Stream\\": "src" @@ -1530,27 +1468,72 @@ "pipe", "stream" ], - "time": "2015-10-07 18:32:58" + "time": "2016-08-22 09:51:07" + }, + { + "name": "react/zmq", + "version": "v0.3.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/zmq.git", + "reference": "2865e3b23000751ed443d3f108da2735abf80716" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/zmq/zipball/2865e3b23000751ed443d3f108da2735abf80716", + "reference": "2865e3b23000751ed443d3f108da2735abf80716", + "shasum": "" + }, + "require": { + "evenement/evenement": "~2.0", + "ext-zmq": "*", + "php": ">=5.4.0", + "react/event-loop": "0.4.*" + }, + "require-dev": { + "ext-pcntl": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.4-dev" + } + }, + "autoload": { + "psr-0": { + "React\\ZMQ": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "ZeroMQ bindings for React.", + "keywords": [ + "zeromq", + "zmq" + ], + "time": "2014-05-25 17:54:51" }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.2", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "d8db871a54619458a805229a057ea2af33c753e8" + "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/d8db871a54619458a805229a057ea2af33c753e8", - "reference": "d8db871a54619458a805229a057ea2af33c753e8", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/4cc92842069c2bbc1f28daaaf1d2576ec4dfe153", + "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "mockery/mockery": "~0.9.1,<0.9.4" + "mockery/mockery": "~0.9.1" }, "type": "library", "extra": { @@ -1583,20 +1566,20 @@ "mail", "mailer" ], - "time": "2016-05-01 08:45:47" + "time": "2016-07-08 11:51:25" }, { "name": "symfony/console", - "version": "v3.0.6", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "34a214710e0714b6efcf40ba3cd1e31373a97820" + "reference": "8ea494c34f0f772c3954b5fbe00bffc5a435e563" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/34a214710e0714b6efcf40ba3cd1e31373a97820", - "reference": "34a214710e0714b6efcf40ba3cd1e31373a97820", + "url": "https://api.github.com/repos/symfony/console/zipball/8ea494c34f0f772c3954b5fbe00bffc5a435e563", + "reference": "8ea494c34f0f772c3954b5fbe00bffc5a435e563", "shasum": "" }, "require": { @@ -1616,7 +1599,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -1643,20 +1626,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2016-04-28 09:48:42" + "time": "2016-08-19 06:48:39" }, { "name": "symfony/debug", - "version": "v3.0.6", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "a06d10888a45afd97534506afb058ec38d9ba35b" + "reference": "34f6ac18c2974ca5fce68adf419ee7d15def6f11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/a06d10888a45afd97534506afb058ec38d9ba35b", - "reference": "a06d10888a45afd97534506afb058ec38d9ba35b", + "url": "https://api.github.com/repos/symfony/debug/zipball/34f6ac18c2974ca5fce68adf419ee7d15def6f11", + "reference": "34f6ac18c2974ca5fce68adf419ee7d15def6f11", "shasum": "" }, "require": { @@ -1673,7 +1656,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -1700,20 +1683,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2016-03-30 10:41:14" + "time": "2016-08-23 13:39:15" }, { "name": "symfony/event-dispatcher", - "version": "v3.0.6", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "807dde98589f9b2b00624dca326740380d78dbbc" + "reference": "c0c00c80b3a69132c4e55c3e7db32b4a387615e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/807dde98589f9b2b00624dca326740380d78dbbc", - "reference": "807dde98589f9b2b00624dca326740380d78dbbc", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c0c00c80b3a69132c4e55c3e7db32b4a387615e5", + "reference": "c0c00c80b3a69132c4e55c3e7db32b4a387615e5", "shasum": "" }, "require": { @@ -1733,7 +1716,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -1760,20 +1743,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2016-05-05 06:56:13" + "time": "2016-07-19 10:45:57" }, { "name": "symfony/finder", - "version": "v3.0.6", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "c54e407b35bc098916704e9fd090da21da4c4f52" + "reference": "e568ef1784f447a0e54dcb6f6de30b9747b0f577" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/c54e407b35bc098916704e9fd090da21da4c4f52", - "reference": "c54e407b35bc098916704e9fd090da21da4c4f52", + "url": "https://api.github.com/repos/symfony/finder/zipball/e568ef1784f447a0e54dcb6f6de30b9747b0f577", + "reference": "e568ef1784f447a0e54dcb6f6de30b9747b0f577", "shasum": "" }, "require": { @@ -1782,7 +1765,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -1809,20 +1792,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2016-03-10 11:13:05" + "time": "2016-08-26 12:04:02" }, { "name": "symfony/http-foundation", - "version": "v3.0.6", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "18b24bc32d2495ae79d76e777368786a6536fe31" + "reference": "63592e00fd90632b57ee50220a1ddb29b6bf3bb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/18b24bc32d2495ae79d76e777368786a6536fe31", - "reference": "18b24bc32d2495ae79d76e777368786a6536fe31", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/63592e00fd90632b57ee50220a1ddb29b6bf3bb4", + "reference": "63592e00fd90632b57ee50220a1ddb29b6bf3bb4", "shasum": "" }, "require": { @@ -1835,7 +1818,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -1862,20 +1845,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2016-04-12 18:09:53" + "time": "2016-08-22 12:11:19" }, { "name": "symfony/http-kernel", - "version": "v3.0.6", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "6a5010978edf0a9646342232531e53bfc7abbcd3" + "reference": "aeda215d6b01f119508c090d2a09ebb5b0bc61f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6a5010978edf0a9646342232531e53bfc7abbcd3", - "reference": "6a5010978edf0a9646342232531e53bfc7abbcd3", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/aeda215d6b01f119508c090d2a09ebb5b0bc61f3", + "reference": "aeda215d6b01f119508c090d2a09ebb5b0bc61f3", "shasum": "" }, "require": { @@ -1883,7 +1866,7 @@ "psr/log": "~1.0", "symfony/debug": "~2.8|~3.0", "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/http-foundation": "~2.8|~3.0" + "symfony/http-foundation": "~2.8.8|~3.0.8|~3.1.2|~3.2" }, "conflict": { "symfony/config": "<2.8" @@ -1917,7 +1900,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -1944,20 +1927,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2016-05-09 22:13:13" + "time": "2016-09-03 15:28:24" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "1289d16209491b584839022f29257ad859b8532d" + "reference": "dff51f72b0706335131b00a7f49606168c582594" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d", - "reference": "1289d16209491b584839022f29257ad859b8532d", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594", + "reference": "dff51f72b0706335131b00a7f49606168c582594", "shasum": "" }, "require": { @@ -1969,7 +1952,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -2003,20 +1986,20 @@ "portable", "shim" ], - "time": "2016-01-20 09:13:37" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/polyfill-php56", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "4d891fff050101a53a4caabb03277284942d1ad9" + "reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/4d891fff050101a53a4caabb03277284942d1ad9", - "reference": "4d891fff050101a53a4caabb03277284942d1ad9", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/3edf57a8fbf9a927533344cef65ad7e1cf31030a", + "reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a", "shasum": "" }, "require": { @@ -2026,7 +2009,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -2059,20 +2042,20 @@ "portable", "shim" ], - "time": "2016-01-20 09:13:37" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/polyfill-util", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4" + "reference": "ef830ce3d218e622b221d6bfad42c751d974bf99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", - "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ef830ce3d218e622b221d6bfad42c751d974bf99", + "reference": "ef830ce3d218e622b221d6bfad42c751d974bf99", "shasum": "" }, "require": { @@ -2081,7 +2064,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -2111,20 +2094,20 @@ "polyfill", "shim" ], - "time": "2016-01-20 09:13:37" + "time": "2016-05-18 14:26:46" }, { "name": "symfony/process", - "version": "v3.0.6", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "53f9407c0bb1c5a79127db8f7bfe12f0f6f3dcdb" + "reference": "e64e93041c80e77197ace5ab9385dedb5a143697" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/53f9407c0bb1c5a79127db8f7bfe12f0f6f3dcdb", - "reference": "53f9407c0bb1c5a79127db8f7bfe12f0f6f3dcdb", + "url": "https://api.github.com/repos/symfony/process/zipball/e64e93041c80e77197ace5ab9385dedb5a143697", + "reference": "e64e93041c80e77197ace5ab9385dedb5a143697", "shasum": "" }, "require": { @@ -2133,7 +2116,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -2160,20 +2143,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2016-04-14 15:30:28" + "time": "2016-08-16 14:58:24" }, { "name": "symfony/routing", - "version": "v3.0.6", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "a6cd168310066176599442aa21f5da86c3f8e0b3" + "reference": "8edf62498a1a4c57ba317664a4b698339c10cdf6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/a6cd168310066176599442aa21f5da86c3f8e0b3", - "reference": "a6cd168310066176599442aa21f5da86c3f8e0b3", + "url": "https://api.github.com/repos/symfony/routing/zipball/8edf62498a1a4c57ba317664a4b698339c10cdf6", + "reference": "8edf62498a1a4c57ba317664a4b698339c10cdf6", "shasum": "" }, "require": { @@ -2202,7 +2185,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -2235,20 +2218,20 @@ "uri", "url" ], - "time": "2016-05-03 12:23:49" + "time": "2016-08-16 14:58:24" }, { "name": "symfony/translation", - "version": "v3.0.6", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "f7a07af51ea067745a521dab1e3152044a2fb1f2" + "reference": "a35edc277513c9bc0f063ca174c36b346f974528" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/f7a07af51ea067745a521dab1e3152044a2fb1f2", - "reference": "f7a07af51ea067745a521dab1e3152044a2fb1f2", + "url": "https://api.github.com/repos/symfony/translation/zipball/a35edc277513c9bc0f063ca174c36b346f974528", + "reference": "a35edc277513c9bc0f063ca174c36b346f974528", "shasum": "" }, "require": { @@ -2272,7 +2255,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -2299,20 +2282,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2016-03-25 01:41:20" + "time": "2016-08-05 08:37:39" }, { "name": "symfony/var-dumper", - "version": "v3.0.6", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "0e918c269093ba4c77fca14e9424fa74ed16f1a6" + "reference": "62ee73706c421654a4c840028954510277f7dfc8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0e918c269093ba4c77fca14e9424fa74ed16f1a6", - "reference": "0e918c269093ba4c77fca14e9424fa74ed16f1a6", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/62ee73706c421654a4c840028954510277f7dfc8", + "reference": "62ee73706c421654a4c840028954510277f7dfc8", "shasum": "" }, "require": { @@ -2328,7 +2311,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -2362,20 +2345,20 @@ "debug", "dump" ], - "time": "2016-04-25 11:17:47" + "time": "2016-08-31 09:05:42" }, { "name": "vlucas/phpdotenv", - "version": "v2.2.1", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "63f37b9395e8041cd4313129c08ece896d06ca8e" + "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/63f37b9395e8041cd4313129c08ece896d06ca8e", - "reference": "63f37b9395e8041cd4313129c08ece896d06ca8e", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c", + "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c", "shasum": "" }, "require": { @@ -2387,7 +2370,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -2412,15 +2395,13 @@ "env", "environment" ], - "time": "2016-04-15 10:48:49" + "time": "2016-09-01 10:05:43" } ], "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "predis/predis-async": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { From e0bb5174072e4f6dcc0a1756a3a75f154db8daab Mon Sep 17 00:00:00 2001 From: William Date: Sun, 2 Oct 2016 11:46:18 -0700 Subject: [PATCH 2/5] Updated read me --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6a91ccf..3ccabab 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ class RatchetServer extends RatchetServer ~~~ You'll need to change the class to in your command line or config. ~~~ -php artisan ratchet:serve --driver=IoServer --class="App\RatchetServer:" +php artisan ratchet:serve --driver=IoServer --class="App\RatchetServer::class" ~~~ # Command Line @@ -101,7 +101,7 @@ Options: # Configuration There are several configuration values that you will want to change. Publish the configuration then you can edit `config/ratchet.php`. ~~~ -php artisan vendor:publish --class="\Askedio\LaravelRatchet\Providers\LaravelRatchetServiceProvider::class" +php artisan vendor:publish ~~~ ### Configuration Options * **class**: Your MessageComponentInterface or WampServerInterface class. From b40e57709b513c26611b22e168a959b32966917b Mon Sep 17 00:00:00 2001 From: William Date: Sun, 2 Oct 2016 11:53:52 -0700 Subject: [PATCH 3/5] Updated read me --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ccabab..d4145a3 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ Options: --host[=HOST] Ratchet server host [default: "0.0.0.0"] -p, --port[=PORT] Ratchet server port [default: "9090"] --class[=CLASS] Class that implements MessageComponentInterface. [default: "Askedio\LaravelRatchet\RatchetServerExample"] - --driver[=DRIVER] Ratchet connection driver [IoServer|WsServer] [default: "IoServer"] + --driver[=DRIVER] Ratchet connection driver [IoServer|WsServer|WampServer] [default: "WampServer"] ... ~~~ From 13d2032a7abf4c6a34ae78d2a534e9c92667c430 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 2 Oct 2016 11:57:31 -0700 Subject: [PATCH 4/5] Updated composer --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7e57b85..d44c8aa 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,8 @@ "type": "library", "require": { "php": ">=5.5.9", - "laravel/framework": "5.3.*", + "ext-zmq": "*", + "laravel/framework": "5.*", "cboden/ratchet": "^0.3", "graham-campbell/throttle": "^5.2", "react/zmq": "0.2.*|0.3.*" From 96ad5c43b47ff1c2e81399c43010075b1bf4293b Mon Sep 17 00:00:00 2001 From: William Date: Sun, 2 Oct 2016 18:58:06 +0000 Subject: [PATCH 5/5] Applied fixes from StyleCI --- src/Console/Commands/RatchetServerCommand.php | 12 ++---- .../LaravelRatchetServiceProvider.php | 2 +- src/Pusher.php | 43 ++++++++++--------- src/config/ratchet.php | 2 +- 4 files changed, 29 insertions(+), 30 deletions(-) diff --git a/src/Console/Commands/RatchetServerCommand.php b/src/Console/Commands/RatchetServerCommand.php index ab6a630..09fea41 100644 --- a/src/Console/Commands/RatchetServerCommand.php +++ b/src/Console/Commands/RatchetServerCommand.php @@ -10,8 +10,6 @@ use Ratchet\WebSocket\WsServer; use Symfony\Component\Console\Input\InputOption; - - class RatchetServerCommand extends Command { /** @@ -117,8 +115,7 @@ private function getWsServerDriver($ratchetServer) */ private function startWampServer() { - - $loop = \React\EventLoop\Factory::create(); + $loop = \React\EventLoop\Factory::create(); $class = $this->option('class'); @@ -130,9 +127,9 @@ private function startWampServer() $pull = $context->getSocket(\ZMQ::SOCKET_PULL); $pull->bind(sprintf('tcp://%s:%d', config('ratchet.zmq.host'), config('ratchet.zmq.port'))); - $pull->on('message', function($message) use ($ratchetServer) { - $ratchetServer->onEntry($message); - }); + $pull->on('message', function ($message) use ($ratchetServer) { + $ratchetServer->onEntry($message); + }); $webSock = new \React\Socket\Server($loop); @@ -160,7 +157,6 @@ private function startWampServer() */ private function server($driver) { - if ($driver == 'WampServer') { return $this->startWampServer(); } diff --git a/src/Providers/LaravelRatchetServiceProvider.php b/src/Providers/LaravelRatchetServiceProvider.php index 63658e7..15bab41 100644 --- a/src/Providers/LaravelRatchetServiceProvider.php +++ b/src/Providers/LaravelRatchetServiceProvider.php @@ -17,7 +17,7 @@ public function register() $this->app->register(\GrahamCampbell\Throttle\ThrottleServiceProvider::class); $this->app->singleton('command.ratchet.serve', function () { - return new RatchetServerCommand(); + return new RatchetServerCommand(); }); $this->commands('command.ratchet.serve'); diff --git a/src/Pusher.php b/src/Pusher.php index 67a4d0e..ab51706 100644 --- a/src/Pusher.php +++ b/src/Pusher.php @@ -5,15 +5,13 @@ use Ratchet\ConnectionInterface; use Ratchet\Wamp\WampServerInterface; -class Pusher implements WampServerInterface { - - - public $subscribedTopics = array(); +class Pusher implements WampServerInterface +{ + public $subscribedTopics = []; protected $console = false; - public function __construct($console) { $this->console = $console; @@ -22,7 +20,8 @@ public function __construct($console) /** * @param string JSON'ified string we'll receive from ZeroMQ */ - public function onEntry($entry) { + public function onEntry($entry) + { $entryData = json_decode($entry, true); if (!array_key_exists($entryData['category'], $this->subscribedTopics)) { @@ -40,7 +39,8 @@ public function onEntry($entry) { * @param \Ratchet\ConnectionInterface $conn * @param string|Topic $topic The topic to subscribe to */ - public function onSubscribe(ConnectionInterface $conn, $topic) { + public function onSubscribe(ConnectionInterface $conn, $topic) + { $this->console->info("onSubscribe: {$conn->WAMP->sessionId} topic: $topic {$topic->count()}"); if (!array_key_exists($topic->getId(), $this->subscribedTopics)) { @@ -49,14 +49,14 @@ public function onSubscribe(ConnectionInterface $conn, $topic) { } } - /** * A request to unsubscribe from a topic has been made. * * @param \Ratchet\ConnectionInterface $conn * @param string|Topic $topic The topic to unsubscribe from */ - public function onUnSubscribe(ConnectionInterface $conn, $topic) { + public function onUnSubscribe(ConnectionInterface $conn, $topic) + { $this->console->info("onUnSubscribe: topic: $topic {$topic->count()}"); } @@ -67,7 +67,8 @@ public function onUnSubscribe(ConnectionInterface $conn, $topic) { * * @throws \Exception */ - public function onOpen(ConnectionInterface $conn) { + public function onOpen(ConnectionInterface $conn) + { $this->console->info("onOpen ({$conn->WAMP->sessionId})"); } @@ -78,11 +79,11 @@ public function onOpen(ConnectionInterface $conn) { * * @throws \Exception */ - public function onClose(ConnectionInterface $conn) { + public function onClose(ConnectionInterface $conn) + { $this->console->info("onClose ({$conn->WAMP->sessionId})"); } - /** * An RPC call has been received. * @@ -91,12 +92,12 @@ public function onClose(ConnectionInterface $conn) { * @param string|Topic $topic The topic to execute the call against * @param array $params Call parameters received from the client */ - public function onCall(ConnectionInterface $conn, $id, $topic, array $params) { - $this->console->info("onCall"); + public function onCall(ConnectionInterface $conn, $id, $topic, array $params) + { + $this->console->info('onCall'); $conn->callError($id, $topic, 'You are not allowed to make calls')->close(); } - /** * A client is attempting to publish content to a subscribed connections on a URI. * @@ -106,8 +107,9 @@ public function onCall(ConnectionInterface $conn, $id, $topic, array $params) { * @param array $exclude A list of session IDs the message should be excluded from (blacklist) * @param array $eligible A list of session Ids the message should be send to (whitelist) */ - public function onPublish(ConnectionInterface $conn, $topic, $event, array $exclude, array $eligible) { - $this->console->info("onPublish"); + public function onPublish(ConnectionInterface $conn, $topic, $event, array $exclude, array $eligible) + { + $this->console->info('onPublish'); } /** @@ -119,7 +121,8 @@ public function onPublish(ConnectionInterface $conn, $topic, $event, array $excl * * @throws \Exception */ - public function onError(ConnectionInterface $conn, \Exception $e) { - $this->console->info("onError" . $e->getMessage()); + public function onError(ConnectionInterface $conn, \Exception $e) + { + $this->console->info('onError'.$e->getMessage()); } -} \ No newline at end of file +} diff --git a/src/config/ratchet.php b/src/config/ratchet.php index 4a3ff63..c10c1c0 100644 --- a/src/config/ratchet.php +++ b/src/config/ratchet.php @@ -21,7 +21,7 @@ ], 'abortOnMessageThrottle' => false, 'blackList' => collect([]), - 'zmq' => [ + 'zmq' => [ 'host' => '127.0.0.1', 'port' => 5555, ],