From ebcc66f1bfd10e4ad1b4d6166a0d46597bbcefe7 Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Thu, 11 Oct 2012 18:33:29 +0000 Subject: [PATCH] Fixed typos --- src/Ratchet/Server/IoServer.php | 2 +- src/Ratchet/Server/IpBlackList.php | 4 ++-- src/Ratchet/Session/Storage/VirtualSessionStorage.php | 2 +- src/Ratchet/Wamp/Topic.php | 2 +- src/Ratchet/Wamp/WampServer.php | 2 +- src/Ratchet/WebSocket/Version/RFC6455.php | 2 +- src/Ratchet/WebSocket/Version/RFC6455/Frame.php | 4 ++-- src/Ratchet/WebSocket/Version/RFC6455/HandshakeVerifier.php | 6 +++--- src/Ratchet/WebSocket/VersionManager.php | 2 +- tests/Ratchet/Tests/Server/FlashPolicyComponentTest.php | 2 +- tests/Ratchet/Tests/Session/SessionComponentTest.php | 2 +- tests/Ratchet/Tests/Wamp/WampConnectionTest.php | 2 +- tests/Ratchet/Tests/WebSocket/Version/RFC6455/FrameTest.php | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Ratchet/Server/IoServer.php b/src/Ratchet/Server/IoServer.php index 62b4282..8b5a2ce 100644 --- a/src/Ratchet/Server/IoServer.php +++ b/src/Ratchet/Server/IoServer.php @@ -8,7 +8,7 @@ use React\EventLoop\Factory as LoopFactory; use React\Socket\Server as Reactor; /** - * Creates an open-ended socket to listen on a port for incomming connections. + * Creates an open-ended socket to listen on a port for incoming connections. * Events are delegated through this to attached applications */ class IoServer { diff --git a/src/Ratchet/Server/IpBlackList.php b/src/Ratchet/Server/IpBlackList.php index bf41b48..dab6c45 100644 --- a/src/Ratchet/Server/IpBlackList.php +++ b/src/Ratchet/Server/IpBlackList.php @@ -20,7 +20,7 @@ class IpBlackList implements MessageComponentInterface { /** * Add an address to the blacklist that will not be allowed to connect to your application - * @param string IP address to block from connecting to yoru application + * @param string IP address to block from connecting to your application * @return IpBlackList */ public function blockAddress($ip) { @@ -31,7 +31,7 @@ class IpBlackList implements MessageComponentInterface { /** * Unblock an address so they can access your application again - * @param string IP address to unblock from connecting to yoru application + * @param string IP address to unblock from connecting to your application * @return IpBlackList */ public function unblockAddress($ip) { diff --git a/src/Ratchet/Session/Storage/VirtualSessionStorage.php b/src/Ratchet/Session/Storage/VirtualSessionStorage.php index 1aee1eb..868cb5b 100644 --- a/src/Ratchet/Session/Storage/VirtualSessionStorage.php +++ b/src/Ratchet/Session/Storage/VirtualSessionStorage.php @@ -12,7 +12,7 @@ class VirtualSessionStorage extends NativeSessionStorage { /** * @param SessionHandlerInterface - * @param string The ID of the session to retreive + * @param string The ID of the session to retrieve * @param Ratchet\Session\Serialize\HandlerInterface */ public function __construct(\SessionHandlerInterface $handler, $sessionId, HandlerInterface $serializer) { diff --git a/src/Ratchet/Wamp/Topic.php b/src/Ratchet/Wamp/Topic.php index 83ca4d9..bfb5628 100644 --- a/src/Ratchet/Wamp/Topic.php +++ b/src/Ratchet/Wamp/Topic.php @@ -30,7 +30,7 @@ class Topic implements \IteratorAggregate, \Countable { } /** - * Send a message to all the connectiosn in this topic + * Send a message to all the connections in this topic * @param string * @return Topic */ diff --git a/src/Ratchet/Wamp/WampServer.php b/src/Ratchet/Wamp/WampServer.php index 48705de..d2bfdcf 100644 --- a/src/Ratchet/Wamp/WampServer.php +++ b/src/Ratchet/Wamp/WampServer.php @@ -5,7 +5,7 @@ use Ratchet\WebSocket\WsServerInterface; use Ratchet\ConnectionInterface; /** - * Enable support for the offical WAMP sub-protocol in your application + * Enable support for the official WAMP sub-protocol in your application * WAMP allows for Pub/Sub and RPC * @link http://wamp.ws The WAMP specification * @link https://github.com/oberstet/AutobahnJS Souce for client side library diff --git a/src/Ratchet/WebSocket/Version/RFC6455.php b/src/Ratchet/WebSocket/Version/RFC6455.php index 8243ed3..d87f19e 100644 --- a/src/Ratchet/WebSocket/Version/RFC6455.php +++ b/src/Ratchet/WebSocket/Version/RFC6455.php @@ -104,7 +104,7 @@ class RFC6455 implements VersionInterface { $from->WebSocket->message = $this->newMessage(); } - // There is a frame fragment attatched to the connection, add to it + // There is a frame fragment attached to the connection, add to it if (!isset($from->WebSocket->frame)) { $from->WebSocket->frame = $this->newFrame(); } diff --git a/src/Ratchet/WebSocket/Version/RFC6455/Frame.php b/src/Ratchet/WebSocket/Version/RFC6455/Frame.php index ed11bb4..9d6c8f5 100644 --- a/src/Ratchet/WebSocket/Version/RFC6455/Frame.php +++ b/src/Ratchet/WebSocket/Version/RFC6455/Frame.php @@ -45,7 +45,7 @@ class Frame implements FrameInterface { /** * If the frame is coalesced this is true - * This is to prevent doing math every time ::isCoaleced is called + * This is to prevent doing math every time ::isCoalesced is called * @var boolean */ private $isCoalesced = false; @@ -420,7 +420,7 @@ class Frame implements FrameInterface { } /** - * Sometimes clients will concatinate more than one frame over the wire + * Sometimes clients will concatenate more than one frame over the wire * This method will take the extra bytes off the end and return them * @todo Consider returning new Frame * @return string diff --git a/src/Ratchet/WebSocket/Version/RFC6455/HandshakeVerifier.php b/src/Ratchet/WebSocket/Version/RFC6455/HandshakeVerifier.php index 19b9a94..c86dbef 100644 --- a/src/Ratchet/WebSocket/Version/RFC6455/HandshakeVerifier.php +++ b/src/Ratchet/WebSocket/Version/RFC6455/HandshakeVerifier.php @@ -70,7 +70,7 @@ class HandshakeVerifier { * @param string|null * @return bool * @todo Find out if I can find the master socket, ensure the port is attached to header if not 80 or 443 - not sure if this is possible, as I tried to hide it - * @todo Once I fix HTTP::getHeaders just verify this isn't NULL or empty...or manybe need to verify it's a valid domin??? Or should it equal $_SERVER['HOST'] ? + * @todo Once I fix HTTP::getHeaders just verify this isn't NULL or empty...or maybe need to verify it's a valid domain??? Or should it equal $_SERVER['HOST'] ? */ public function verifyHost($val) { return (null !== $val); @@ -103,7 +103,7 @@ class HandshakeVerifier { } /** - * This function verifyies the nonce is valid (64 big encoded, 16 bytes random string) + * This function verifies the nonce is valid (64 big encoded, 16 bytes random string) * @param string|null * @return bool * @todo The spec says we don't need to base64_decode - can I just check if the length is 24 and not decode? @@ -118,7 +118,7 @@ class HandshakeVerifier { * Origin is an optional field * @param string|null * @return bool - * @todo Implement verification functality - see section 4.2.1.7 + * @todo Implement verification functionality - see section 4.2.1.7 */ public function verifyOrigin($val) { if (null === $val) { diff --git a/src/Ratchet/WebSocket/VersionManager.php b/src/Ratchet/WebSocket/VersionManager.php index e7db28f..e3b93c9 100644 --- a/src/Ratchet/WebSocket/VersionManager.php +++ b/src/Ratchet/WebSocket/VersionManager.php @@ -51,7 +51,7 @@ class VersionManager { /** * Enable support for a specific version of the WebSocket protocol - * @param Ratchet\WebSocket\Vesion\VersionInterface + * @param Ratchet\WebSocket\Version\VersionInterface * @return HandshakeNegotiator */ public function enableVersion(VersionInterface $version) { diff --git a/tests/Ratchet/Tests/Server/FlashPolicyComponentTest.php b/tests/Ratchet/Tests/Server/FlashPolicyComponentTest.php index 77bd4ae..15fb45d 100644 --- a/tests/Ratchet/Tests/Server/FlashPolicyComponentTest.php +++ b/tests/Ratchet/Tests/Server/FlashPolicyComponentTest.php @@ -67,7 +67,7 @@ class FlashPolicyTest extends \PHPUnit_Framework_TestCase { array(true, '*') , array(true, 'example.com') , array(true, 'exam-ple.com') - , array(true, '*.exmple.com') + , array(true, '*.example.com') , array(true, 'www.example.com') , array(true, 'dev.dev.example.com') , array(true, 'http://example.com') diff --git a/tests/Ratchet/Tests/Session/SessionComponentTest.php b/tests/Ratchet/Tests/Session/SessionComponentTest.php index 71e37bf..ed75191 100644 --- a/tests/Ratchet/Tests/Session/SessionComponentTest.php +++ b/tests/Ratchet/Tests/Session/SessionComponentTest.php @@ -38,7 +38,7 @@ class SessionProviderTest extends \PHPUnit_Framework_TestCase { } /** - * I think I have severly butchered this test...it's not so much of a unit test as it is a full-fledged component test + * I think I have severely butchered this test...it's not so much of a unit test as it is a full-fledged component test */ public function testConnectionValueFromPdo() { if (!extension_loaded('PDO')) { diff --git a/tests/Ratchet/Tests/Wamp/WampConnectionTest.php b/tests/Ratchet/Tests/Wamp/WampConnectionTest.php index 9632b03..a1679ed 100644 --- a/tests/Ratchet/Tests/Wamp/WampConnectionTest.php +++ b/tests/Ratchet/Tests/Wamp/WampConnectionTest.php @@ -45,7 +45,7 @@ class WampConnectionTest extends \PHPUnit_Framework_TestCase { public function testPrefix() { $shortOut = 'outgoing'; - $longOut = 'http://example.com/outoing'; + $longOut = 'http://example.com/outgoing'; $this->mock->expects($this->once())->method('send')->with(json_encode(array(1, $shortOut, $longOut))); diff --git a/tests/Ratchet/Tests/WebSocket/Version/RFC6455/FrameTest.php b/tests/Ratchet/Tests/WebSocket/Version/RFC6455/FrameTest.php index dda8b93..7b860f3 100644 --- a/tests/Ratchet/Tests/WebSocket/Version/RFC6455/FrameTest.php +++ b/tests/Ratchet/Tests/WebSocket/Version/RFC6455/FrameTest.php @@ -284,7 +284,7 @@ class FrameTest extends \PHPUnit_Framework_TestCase { /** * @dataProvider maskingKeyProvider * @covers Ratchet\WebSocket\Version\RFC6455\Frame::getMaskingKey - * @todo I I wrote the dataProvider incorrectly, skpping for now + * @todo I I wrote the dataProvider incorrectly, skipping for now */ public function testGetMaskingKey($mask) { $this->_frame->addBuffer(static::encode($this->_firstByteFinText));