diff --git a/src/Handshake/ClientNegotiator.php b/src/Handshake/ClientNegotiator.php index 4acf5e4..c6e5b3f 100644 --- a/src/Handshake/ClientNegotiator.php +++ b/src/Handshake/ClientNegotiator.php @@ -34,7 +34,7 @@ class ClientNegotiator { // https://bugs.php.net/bug.php?id=74240 - need >=7.1.4 or >=7.0.18 $supported = PermessageDeflateOptions::permessageDeflateSupported(); if (!$supported) { - if ($perMessageDeflateOptions->getDeflate()) { + if ($perMessageDeflateOptions->isEnabled()) { trigger_error('permessage-deflate is being disabled because it is not support by your PHP version.', E_USER_NOTICE); } $perMessageDeflateOptions = PermessageDeflateOptions::createDisabled(); diff --git a/src/Handshake/PermessageDeflateOptions.php b/src/Handshake/PermessageDeflateOptions.php index ff983c1..4dde2f1 100644 --- a/src/Handshake/PermessageDeflateOptions.php +++ b/src/Handshake/PermessageDeflateOptions.php @@ -12,7 +12,7 @@ final class PermessageDeflateOptions /* this is a private instead of const for 5.4 compatibility */ private static $VALID_BITS = ['8', '9', '10', '11', '12', '13', '14', '15']; - private $deflate = false; + private $deflateEnabled = false; private $server_no_context_takeover; private $client_no_context_takeover; @@ -22,12 +22,13 @@ final class PermessageDeflateOptions private function __construct() { } public static function createDefault() { - $new = new static(); - $new->deflate = true; - $new->client_max_window_bits = self::MAX_WINDOW_BITS; + $new = new static(); + $new->deflateEnabled = true; + $new->client_max_window_bits = self::MAX_WINDOW_BITS; $new->client_no_context_takeover = false; - $new->server_max_window_bits = self::MAX_WINDOW_BITS; + $new->server_max_window_bits = self::MAX_WINDOW_BITS; $new->server_no_context_takeover = false; + return $new; } @@ -96,8 +97,8 @@ final class PermessageDeflateOptions } array_shift($parts); - $options = new static(); - $options->deflate = true; + $options = new static(); + $options->deflateEnabled = true; foreach ($parts as $part) { $kv = explode('=', $part); $key = $kv[0]; @@ -152,11 +153,6 @@ final class PermessageDeflateOptions return $optionSets; } -// public static function validateResponseToRequest(ResponseInterface $response, RequestInterface $request) { -// $requestOptions = static::fromRequestOrResponse($request); -// $responseOptions = static::fromRequestOrResponse($response); -// } - /** * @return mixed */ @@ -192,9 +188,9 @@ final class PermessageDeflateOptions /** * @return bool */ - public function getDeflate() + public function isEnabled() { - return $this->deflate; + return $this->deflateEnabled; } /** @@ -203,7 +199,7 @@ final class PermessageDeflateOptions */ public function addHeaderToResponse(ResponseInterface $response) { - if (!$this->deflate) { + if (!$this->deflateEnabled) { return $response; } @@ -225,7 +221,7 @@ final class PermessageDeflateOptions } public function addHeaderToRequest(RequestInterface $request) { - if (!$this->deflate) { + if (!$this->deflateEnabled) { return $request; } diff --git a/src/Handshake/ServerNegotiator.php b/src/Handshake/ServerNegotiator.php index 3059f65..64cc415 100644 --- a/src/Handshake/ServerNegotiator.php +++ b/src/Handshake/ServerNegotiator.php @@ -126,7 +126,7 @@ class ServerNegotiator implements NegotiatorInterface { return new Response(400, [], null, '1.1', $e->getMessage()); } - if ($this->enablePerMessageDeflate && $perMessageDeflateRequest->getDeflate()) { + if ($this->enablePerMessageDeflate && $perMessageDeflateRequest->isEnabled()) { $response = $perMessageDeflateRequest->addHeaderToResponse($response); } diff --git a/src/Messaging/MessageBuffer.php b/src/Messaging/MessageBuffer.php index 63f9f47..e6bf1ce 100644 --- a/src/Messaging/MessageBuffer.php +++ b/src/Messaging/MessageBuffer.php @@ -62,7 +62,7 @@ class MessageBuffer { /** * @var bool */ - private $deflate = false; + private $deflateEnabled = false; /** * @var int @@ -104,9 +104,9 @@ class MessageBuffer { $this->permessageDeflateOptions = $permessageDeflateOptions ?: PermessageDeflateOptions::createDisabled(); - $this->deflate = $this->permessageDeflateOptions->getDeflate(); + $this->deflateEnabled = $this->permessageDeflateOptions->isEnabled(); - if ($this->deflate && !is_callable($this->sender)) { + if ($this->deflateEnabled && !is_callable($this->sender)) { throw new \InvalidArgumentException('sender must be set when deflate is enabled'); } @@ -263,7 +263,7 @@ class MessageBuffer { * @return \Ratchet\RFC6455\Messaging\FrameInterface|FrameInterface */ public function frameCheck(FrameInterface $frame) { - if ((false !== $frame->getRsv1() && !$this->deflate) || + if ((false !== $frame->getRsv1() && !$this->deflateEnabled) || false !== $frame->getRsv2() || false !== $frame->getRsv3() ) { @@ -381,7 +381,7 @@ class MessageBuffer { throw new \Exception('To send frames using the MessageBuffer, sender must be set.'); } - if ($this->deflate && + if ($this->deflateEnabled && ($frame->getOpcode() === Frame::OP_TEXT || $frame->getOpcode() === Frame::OP_BINARY)) { $frame = $this->deflateFrame($frame); }