diff --git a/src/Ratchet/WebSocket/Version/RFC6455.php b/src/Ratchet/WebSocket/Version/RFC6455.php index 4e89bb7..cf0e5f5 100644 --- a/src/Ratchet/WebSocket/Version/RFC6455.php +++ b/src/Ratchet/WebSocket/Version/RFC6455.php @@ -240,15 +240,6 @@ class RFC6455 implements VersionInterface { return new Frame($payload, $final, $opcode); } - /** - * @todo This is needed when a client is created - needs re-write as missing parts of protocol - * @param string - * @return string - */ - public function frame($message, $mask = true) { - return $this->newFrame($message)->getContents(); - } - /** * Used when doing the handshake to encode the key, verifying client/server are speaking the same language * @param string diff --git a/src/Ratchet/WebSocket/Version/RFC6455/Frame.php b/src/Ratchet/WebSocket/Version/RFC6455/Frame.php index 2b85039..a0fc11c 100644 --- a/src/Ratchet/WebSocket/Version/RFC6455/Frame.php +++ b/src/Ratchet/WebSocket/Version/RFC6455/Frame.php @@ -62,19 +62,6 @@ class Frame implements FrameInterface { $this->addBuffer(static::encode($raw) . $payload); } - /** - * @param string A valid UTF-8 string to send over the wire - * @param bool Is the final frame in a message - * @param int The opcode of the frame, see constants - * @param bool Mask the payload - * @return Frame - * @throws InvalidArgumentException If the payload is not a valid UTF-8 string - * @throws LengthException If the payload is too big - */ - public static function create($payload, $final = true, $opcode = 1) { - return new static($payload, $final, $opcode); - } - /** * Encode the fake binary string to send over the wire * @param string of 1's and 0's diff --git a/tests/Ratchet/Tests/WebSocket/Version/RFC6455/FrameTest.php b/tests/Ratchet/Tests/WebSocket/Version/RFC6455/FrameTest.php index d90f984..aeae1a5 100644 --- a/tests/Ratchet/Tests/WebSocket/Version/RFC6455/FrameTest.php +++ b/tests/Ratchet/Tests/WebSocket/Version/RFC6455/FrameTest.php @@ -202,23 +202,13 @@ class FrameTest extends \PHPUnit_Framework_TestCase { $this->assertEquals(strlen($msg), $this->_frame->getPayloadLength()); } - /** - * @todo Use a masking key generator when one is coded later - */ - protected function generateMask() { - $mask = ''; - for($i = 0; $i < 4; $i++) { - $mask .= chr(rand(0, 255)); - } - - return $mask; - } - public function maskingKeyProvider() { + $frame = new Frame; + return array( - array($this->generateMask()) - , array($this->generateMask()) - , array($this->generateMask()) + array($frame->generateMaskingKey()) + , array($frame->generateMaskingKey()) + , array($frame->generateMaskingKey()) ); } @@ -265,7 +255,7 @@ class FrameTest extends \PHPUnit_Framework_TestCase { $len = 65525; $pl = $this->generateRandomString($len); - $frame = Frame::create($pl, true, Frame::OP_PING); + $frame = new Frame($pl, true, Frame::OP_PING); $this->assertTrue($frame->isFinal()); $this->assertEquals(Frame::OP_PING, $frame->getOpcode()); @@ -277,17 +267,17 @@ class FrameTest extends \PHPUnit_Framework_TestCase { public function testReallyLongCreate() { $len = 65575; - $frame = Frame::create($this->generateRandomString($len)); + $frame = new Frame($this->generateRandomString($len)); $this->assertEquals($len, $frame->getPayloadLength()); } public function testExtractOverflow() { $string1 = $this->generateRandomString(); - $frame1 = Frame::create($string1); + $frame1 = new Frame($string1); $string2 = $this->generateRandomString(); - $frame2 = Frame::create($string2); + $frame2 = new Frame($string2); $cat = new Frame; $cat->addBuffer($frame1->getContents() . $frame2->getContents()); @@ -304,7 +294,7 @@ class FrameTest extends \PHPUnit_Framework_TestCase { public function testEmptyExtractOverflow() { $string = $this->generateRandomString(); - $frame = Frame::create($string); + $frame = new Frame($string); $this->assertEquals($string, $frame->getPayload()); $this->assertEquals('', $frame->extractOverflow()); @@ -313,7 +303,8 @@ class FrameTest extends \PHPUnit_Framework_TestCase { public function testMasking() { $msg = 'The quick brown fox jumps over the lazy dog.'; - $frame = Frame::create($msg)->maskPayload(); + $frame = new Frame($msg); + $frame->maskPayload(); $this->assertTrue($frame->isMasked()); $this->assertEquals($msg, $frame->getPayload()); @@ -321,7 +312,8 @@ class FrameTest extends \PHPUnit_Framework_TestCase { public function testUnMaskPayload() { $string = $this->generateRandomString(); - $frame = Frame::create($string)->maskPayload()->unMaskPayload(); + $frame = new Frame($string); + $frame->maskPayload()->unMaskPayload(); $this->assertFalse($frame->isMasked()); $this->assertEquals($string, $frame->getPayload()); diff --git a/tests/Ratchet/Tests/WebSocket/Version/RFC6455/MessageTest.php b/tests/Ratchet/Tests/WebSocket/Version/RFC6455/MessageTest.php index 67e11b9..5cc2a58 100644 --- a/tests/Ratchet/Tests/WebSocket/Version/RFC6455/MessageTest.php +++ b/tests/Ratchet/Tests/WebSocket/Version/RFC6455/MessageTest.php @@ -26,8 +26,8 @@ class MessageTest extends \PHPUnit_Framework_TestCase { $a = 'Hello '; $b = 'World!'; - $f1 = Frame::create($a, false); - $f2 = Frame::create($b, true, Frame::OP_CONTINUE); + $f1 = new Frame($a, false); + $f2 = new Frame($b, true, Frame::OP_CONTINUE); $this->message->addFrame($f1)->addFrame($f2); @@ -36,7 +36,7 @@ class MessageTest extends \PHPUnit_Framework_TestCase { } public function testUnbufferedFragment() { - $this->message->addFrame(Frame::create('The quick brow', false)); + $this->message->addFrame(new Frame('The quick brow', false)); $this->setExpectedException('UnderflowException'); $this->message->getPayload(); @@ -44,9 +44,9 @@ class MessageTest extends \PHPUnit_Framework_TestCase { public function testGetOpCode() { $this->message - ->addFrame(Frame::create('The quick brow', false, Frame::OP_TEXT)) - ->addFrame(Frame::create('n fox jumps ov', false, Frame::OP_CONTINUE)) - ->addFrame(Frame::create('er the lazy dog', true, Frame::OP_CONTINUE)) + ->addFrame(new Frame('The quick brow', false, Frame::OP_TEXT)) + ->addFrame(new Frame('n fox jumps ov', false, Frame::OP_CONTINUE)) + ->addFrame(new Frame('er the lazy dog', true, Frame::OP_CONTINUE)) ; $this->assertEquals(Frame::OP_TEXT, $this->message->getOpCode()); @@ -54,8 +54,8 @@ class MessageTest extends \PHPUnit_Framework_TestCase { public function testGetUnBufferedPayloadLength() { $this->message - ->addFrame(Frame::create('The quick brow', false, Frame::OP_TEXT)) - ->addFrame(Frame::create('n fox jumps ov', false, Frame::OP_CONTINUE)) + ->addFrame(new Frame('The quick brow', false, Frame::OP_TEXT)) + ->addFrame(new Frame('n fox jumps ov', false, Frame::OP_CONTINUE)) ; $this->assertEquals(28, $this->message->getPayloadLength());