Merge branch 'refs/heads/hhvm'

This commit is contained in:
Chris Boden 2014-02-17 09:14:31 -05:00
commit e1ced856cc
2 changed files with 13 additions and 3 deletions

View File

@ -4,7 +4,11 @@ php:
- 5.3 - 5.3
- 5.4 - 5.4
- 5.5 - 5.5
- hhvm
matrix:
allow_failures:
- php: hhvm
before_script: before_script:
- curl -s http://getcomposer.org/installer | php - composer install --dev --prefer-source
- php composer.phar install --dev --prefer-source

View File

@ -56,7 +56,13 @@ class SessionProvider implements MessageComponentInterface, WsServerInterface {
$this->setOptions($options); $this->setOptions($options);
if (null === $serializer) { if (null === $serializer) {
$serialClass = __NAMESPACE__ . "\\Serialize\\{$this->toClassCase(ini_get('session.serialize_handler'))}Handler"; // awesome/terrible hack, eh? // Temporarily fixing HHVM issue w/ reading ini values
$handler_name = ini_get('session.serialize_handler');
if ('' === $handler_name) {
$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');
} }