faeez/mxmbsocket
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Repo. Project Releases Wiki Activity

Merge branch 'master' into 0.4

Browse Source 
# Conflicts:
#	README.md
This commit is contained in:
Chris Boden 2017-09-10 12:03:39 -04:00
commit 19fa7f7e98
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -6,7 +6,13 @@ php:
- 5.6 - 5.6
- 7.0 - 7.0
- 7.1 - 7.1
- hhvm
matrix:
include:
- php: hhvm
dist: trusty
allow_failures:
- php: hhvm
before_script: before_script:
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "session.serialize_handler = php" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;' - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "session.serialize_handler = php" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'

2
src/Ratchet/Wamp/Topic.php
View File

@ -38,7 +38,7 @@ class Topic implements \IteratorAggregate, \Countable {
/** /**
* Send a message to all the connections in this topic * Send a message to all the connections in this topic
* @param string $msg Payload to publish * @param string|array $msg Payload to publish
* @param array $exclude A list of session IDs the message should be excluded from (blacklist) * @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) * @param array $eligible A list of session Ids the message should be send to (whitelist)
* @return Topic The same Topic object to chain * @return Topic The same Topic object to chain