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

Merge branch 'refs/heads/hhvm'

Browse Source
This commit is contained in:
Chris Boden 2014-05-03 10:30:47 -04:00
commit 02a63c180d
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -11,4 +11,5 @@ matrix:
- php: hhvm - 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;'
- composer install --dev --prefer-source - composer install --dev --prefer-source

9
src/Ratchet/Session/SessionProvider.php
View File

@ -56,14 +56,7 @@ class SessionProvider implements MessageComponentInterface, WsServerInterface {
$this->setOptions($options); $this->setOptions($options);
if (null === $serializer) { if (null === $serializer) {
// Temporarily fixing HHVM issue w/ reading ini values $serialClass = __NAMESPACE__ . "\\Serialize\\{$this->toClassCase(ini_get('session.serialize_handler'))}Handler"; // awesome/terrible hack, eh?
$handler_name = ini_get('session.serialize_handler');
if ('' === $handler_name) {
trigger_error('ini value session.seralize_handler was empty, assuming "php" - tmp hack/fix, bad things might happen', E_USER_WARNING);
$handler_name = 'php';
}
$serialClass = __NAMESPACE__ . "\\Serialize\\{$this->toClassCase($handler_name)}Handler"; // awesome/terrible hack, eh?
if (!class_exists($serialClass)) { if (!class_exists($serialClass)) {
throw new \RuntimeException('Unable to parse session serialize handler'); throw new \RuntimeException('Unable to parse session serialize handler');
} }