From 227e285606a2d7edfd5f5573623810ea1b568ba7 Mon Sep 17 00:00:00 2001
From: Aaron Piotrowski <aaron@trowski.com>
Date: Sun, 3 Sep 2023 18:00:48 -0500
Subject: [PATCH] Move WebsocketFrameType into Parser namespace

---
 src/Internal/Rfc6455FrameHandler.php    | 2 +-
 src/Parser/Rfc6455FrameCompiler.php     | 1 -
 src/Parser/Rfc6455Parser.php            | 1 -
 src/Parser/WebsocketFrameCompiler.php   | 2 --
 src/Parser/WebsocketFrameHandler.php    | 2 --
 src/{ => Parser}/WebsocketFrameType.php | 2 +-
 src/Rfc6455Client.php                   | 1 +
 test/ParserTest.php                     | 2 +-
 test/WebsocketClientTest.php            | 2 +-
 test/functions.php                      | 2 +-
 10 files changed, 6 insertions(+), 11 deletions(-)
 rename src/{ => Parser}/WebsocketFrameType.php (92%)

diff --git a/src/Internal/Rfc6455FrameHandler.php b/src/Internal/Rfc6455FrameHandler.php
index 1ff9d8b..55b59e0 100644
--- a/src/Internal/Rfc6455FrameHandler.php
+++ b/src/Internal/Rfc6455FrameHandler.php
@@ -14,12 +14,12 @@
 use Amp\TimeoutCancellation;
 use Amp\Websocket\Parser\WebsocketFrameCompiler;
 use Amp\Websocket\Parser\WebsocketFrameHandler;
+use Amp\Websocket\Parser\WebsocketFrameType;
 use Amp\Websocket\Parser\WebsocketParser;
 use Amp\Websocket\Parser\WebsocketParserException;
 use Amp\Websocket\WebsocketCloseCode;
 use Amp\Websocket\WebsocketClosedException;
 use Amp\Websocket\WebsocketCloseInfo;
-use Amp\Websocket\WebsocketFrameType;
 use Amp\Websocket\WebsocketHeartbeatQueue;
 use Amp\Websocket\WebsocketMessage;
 use Amp\Websocket\WebsocketRateLimit;
diff --git a/src/Parser/Rfc6455FrameCompiler.php b/src/Parser/Rfc6455FrameCompiler.php
index d8d2de4..067c840 100644
--- a/src/Parser/Rfc6455FrameCompiler.php
+++ b/src/Parser/Rfc6455FrameCompiler.php
@@ -5,7 +5,6 @@
 use Amp\ForbidCloning;
 use Amp\ForbidSerialization;
 use Amp\Websocket\Compression\WebsocketCompressionContext;
-use Amp\Websocket\WebsocketFrameType;
 
 final class Rfc6455FrameCompiler implements WebsocketFrameCompiler
 {
diff --git a/src/Parser/Rfc6455Parser.php b/src/Parser/Rfc6455Parser.php
index 9dc7a93..900b2bc 100644
--- a/src/Parser/Rfc6455Parser.php
+++ b/src/Parser/Rfc6455Parser.php
@@ -7,7 +7,6 @@
 use Amp\Parser\Parser;
 use Amp\Websocket\Compression\WebsocketCompressionContext;
 use Amp\Websocket\WebsocketCloseCode;
-use Amp\Websocket\WebsocketFrameType;
 
 final class Rfc6455Parser implements WebsocketParser
 {
diff --git a/src/Parser/WebsocketFrameCompiler.php b/src/Parser/WebsocketFrameCompiler.php
index f9f1554..b63244c 100644
--- a/src/Parser/WebsocketFrameCompiler.php
+++ b/src/Parser/WebsocketFrameCompiler.php
@@ -2,8 +2,6 @@
 
 namespace Amp\Websocket\Parser;
 
-use Amp\Websocket\WebsocketFrameType;
-
 interface WebsocketFrameCompiler
 {
     /**
diff --git a/src/Parser/WebsocketFrameHandler.php b/src/Parser/WebsocketFrameHandler.php
index 2f8d639..66d9b2a 100644
--- a/src/Parser/WebsocketFrameHandler.php
+++ b/src/Parser/WebsocketFrameHandler.php
@@ -2,8 +2,6 @@
 
 namespace Amp\Websocket\Parser;
 
-use Amp\Websocket\WebsocketFrameType;
-
 interface WebsocketFrameHandler
 {
     /**
diff --git a/src/WebsocketFrameType.php b/src/Parser/WebsocketFrameType.php
similarity index 92%
rename from src/WebsocketFrameType.php
rename to src/Parser/WebsocketFrameType.php
index 66768a0..d863869 100644
--- a/src/WebsocketFrameType.php
+++ b/src/Parser/WebsocketFrameType.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Amp\Websocket;
+namespace Amp\Websocket\Parser;
 
 /**
  * Frame type determined by frame opcode.
diff --git a/src/Rfc6455Client.php b/src/Rfc6455Client.php
index b516e8e..d0568ad 100644
--- a/src/Rfc6455Client.php
+++ b/src/Rfc6455Client.php
@@ -17,6 +17,7 @@
 use Amp\Websocket\Parser\Rfc6455FrameCompilerFactory;
 use Amp\Websocket\Parser\Rfc6455ParserFactory;
 use Amp\Websocket\Parser\WebsocketFrameCompilerFactory;
+use Amp\Websocket\Parser\WebsocketFrameType;
 use Amp\Websocket\Parser\WebsocketParserFactory;
 use Revolt\EventLoop;
 
diff --git a/test/ParserTest.php b/test/ParserTest.php
index cec38e8..8305152 100644
--- a/test/ParserTest.php
+++ b/test/ParserTest.php
@@ -5,10 +5,10 @@
 use Amp\PHPUnit\AsyncTestCase;
 use Amp\Socket\Socket;
 use Amp\Websocket\Parser\Rfc6455ParserFactory;
+use Amp\Websocket\Parser\WebsocketFrameType;
 use Amp\Websocket\Rfc6455Client;
 use Amp\Websocket\WebsocketCloseCode;
 use Amp\Websocket\WebsocketClosedException;
-use Amp\Websocket\WebsocketFrameType;
 use function Amp\delay;
 
 class ParserTest extends AsyncTestCase
diff --git a/test/WebsocketClientTest.php b/test/WebsocketClientTest.php
index 1af6c69..bc6368f 100644
--- a/test/WebsocketClientTest.php
+++ b/test/WebsocketClientTest.php
@@ -11,10 +11,10 @@
 use Amp\Socket\Socket;
 use Amp\Socket\SocketException;
 use Amp\Websocket\Parser\Rfc6455ParserFactory;
+use Amp\Websocket\Parser\WebsocketFrameType;
 use Amp\Websocket\Rfc6455Client;
 use Amp\Websocket\WebsocketCloseCode;
 use Amp\Websocket\WebsocketClosedException;
-use Amp\Websocket\WebsocketFrameType;
 use Amp\Websocket\WebsocketTimestamp;
 use PHPUnit\Framework\MockObject\MockObject;
 use Revolt\EventLoop;
diff --git a/test/functions.php b/test/functions.php
index d94f1ba..6d3cf92 100644
--- a/test/functions.php
+++ b/test/functions.php
@@ -2,7 +2,7 @@
 
 namespace Amp\Websocket\Test;
 
-use Amp\Websocket\WebsocketFrameType;
+use Amp\Websocket\Parser\WebsocketFrameType;
 
 // 4-byte "random" mask
 const MASK = "\xF4\x37\x7A\x9C";