Move @internal classes to Io namespace

clue · clue · commit 836b50346562 · 2017-11-17T21:00:51.000+01:00
diff --git a/src/Io/ChunkedDecoder.php b/src/Io/ChunkedDecoder.php
@@ -1,10 +1,11 @@
 <?php
-namespace React\Http;
+
+namespace React\Http\Io;
 
 use Evenement\EventEmitter;
 use React\Stream\ReadableStreamInterface;
-use React\Stream\WritableStreamInterface;
 use React\Stream\Util;
+use React\Stream\WritableStreamInterface;
 use Exception;
 
 /** @internal */
diff --git a/src/Io/ChunkedEncoder.php b/src/Io/ChunkedEncoder.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace React\Http;
+namespace React\Http\Io;
 
 use Evenement\EventEmitter;
 use React\Stream\ReadableStreamInterface;
-use React\Stream\WritableStreamInterface;
 use React\Stream\Util;
+use React\Stream\WritableStreamInterface;
 
 /** @internal */
 class ChunkedEncoder extends EventEmitter implements ReadableStreamInterface
diff --git a/src/Io/CloseProtectionStream.php b/src/Io/CloseProtectionStream.php
@@ -1,13 +1,14 @@
 <?php
 
-namespace React\Http;
+namespace React\Http\Io;
 
 use Evenement\EventEmitter;
 use React\Stream\ReadableStreamInterface;
-use React\Stream\WritableStreamInterface;
 use React\Stream\Util;
+use React\Stream\WritableStreamInterface;
 
-/** @internal
+/**
+ * @internal
  * This stream is used to protect the passed stream against closing.
  * */
 class CloseProtectionStream extends EventEmitter implements ReadableStreamInterface
diff --git a/src/Io/HttpBodyStream.php b/src/Io/HttpBodyStream.php
@@ -1,11 +1,12 @@
 <?php
-namespace React\Http;
 
+namespace React\Http\Io;
+
+use Evenement\EventEmitter;
 use Psr\Http\Message\StreamInterface;
 use React\Stream\ReadableStreamInterface;
-use React\Stream\WritableStreamInterface;
-use Evenement\EventEmitter;
 use React\Stream\Util;
+use React\Stream\WritableStreamInterface;
 
 /**
  * @internal
diff --git a/src/Io/LengthLimitedStream.php b/src/Io/LengthLimitedStream.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace React\Http;
+namespace React\Http\Io;
 
 use Evenement\EventEmitter;
 use React\Stream\ReadableStreamInterface;
-use React\Stream\WritableStreamInterface;
 use React\Stream\Util;
+use React\Stream\WritableStreamInterface;
 
 /** @internal */
 class LengthLimitedStream extends EventEmitter implements ReadableStreamInterface
diff --git a/src/Io/MultipartParser.php b/src/Io/MultipartParser.php
@@ -1,10 +1,8 @@
 <?php
 
-namespace React\Http\Middleware;
+namespace React\Http\Io;
 
 use Psr\Http\Message\ServerRequestInterface;
-use React\Http\HttpBodyStream;
-use React\Http\UploadedFile;
 use RingCentral\Psr7;
 
 /**
diff --git a/src/Io/RequestHeaderParser.php b/src/Io/RequestHeaderParser.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace React\Http;
+namespace React\Http\Io;
 
 use Evenement\EventEmitter;
-use Exception;
 use RingCentral\Psr7 as g7;
+use Exception;
 
 /**
  * @event headers
diff --git a/src/Io/ServerRequest.php b/src/Io/ServerRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace React\Http;
+namespace React\Http\Io;
 
 use Psr\Http\Message\ServerRequestInterface;
 use RingCentral\Psr7\Request;
diff --git a/src/Io/UploadedFile.php b/src/Io/UploadedFile.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace React\Http;
+namespace React\Http\Io;
 
-use InvalidArgumentException;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UploadedFileInterface;
+use InvalidArgumentException;
 use RuntimeException;
 
 /**
diff --git a/src/Middleware/RequestBodyParserMiddleware.php b/src/Middleware/RequestBodyParserMiddleware.php
@@ -3,6 +3,7 @@
 namespace React\Http\Middleware;
 
 use Psr\Http\Message\ServerRequestInterface;
+use React\Http\Io\MultipartParser;
 
 final class RequestBodyParserMiddleware
 {
diff --git a/src/Response.php b/src/Response.php
@@ -2,9 +2,9 @@
 
 namespace React\Http;
 
-use RingCentral\Psr7\Response as Psr7Response;
+use React\Http\Io\HttpBodyStream;
 use React\Stream\ReadableStreamInterface;
-use React\Http\HttpBodyStream;
+use RingCentral\Psr7\Response as Psr7Response;
 
 /**
  * Implementation of the PSR-7 ResponseInterface
diff --git a/src/Server.php b/src/Server.php
@@ -6,6 +6,13 @@
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use React\Http\Io\ChunkedDecoder;
+use React\Http\Io\ChunkedEncoder;
+use React\Http\Io\CloseProtectionStream;
+use React\Http\Io\HttpBodyStream;
+use React\Http\Io\LengthLimitedStream;
+use React\Http\Io\RequestHeaderParser;
+use React\Http\Io\ServerRequest;
 use React\Promise\CancellablePromiseInterface;
 use React\Promise\Promise;
 use React\Socket\ConnectionInterface;
diff --git a/tests/Io/ChunkedDecoderTest.php b/tests/Io/ChunkedDecoderTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace React\Tests\Http;
+namespace React\Tests\Http\Io;
 
+use React\Http\Io\ChunkedDecoder;
 use React\Stream\ThroughStream;
-use React\Http\ChunkedDecoder;
+use React\Tests\Http\TestCase;
 
 class ChunkedDecoderTest extends TestCase
 {
diff --git a/tests/Io/ChunkedEncoderTest.php b/tests/Io/ChunkedEncoderTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace React\Tests\Http;
+namespace React\Tests\Http\Io;
 
+use React\Http\Io\ChunkedEncoder;
 use React\Stream\ThroughStream;
-use React\Http\ChunkedEncoder;
+use React\Tests\Http\TestCase;
 
 class ChunkedEncoderTest extends TestCase
 {
diff --git a/tests/Io/CloseProtectionStreamTest.php b/tests/Io/CloseProtectionStreamTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace React\Tests\Http;
+namespace React\Tests\Http\Io;
 
-use React\Http\CloseProtectionStream;
+use React\Http\Io\CloseProtectionStream;
 use React\Stream\ThroughStream;
+use React\Tests\Http\TestCase;
 
 class CloseProtectionStreamTest extends TestCase
 {
diff --git a/tests/Io/HttpBodyStreamTest.php b/tests/Io/HttpBodyStreamTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace React\Tests\Http;
+namespace React\Tests\Http\Io;
 
-use React\Http\HttpBodyStream;
+use React\Http\Io\HttpBodyStream;
 use React\Stream\ThroughStream;
+use React\Tests\Http\TestCase;
 
 class HttpBodyStreamTest extends TestCase
 {
diff --git a/tests/Io/LengthLimitedStreamTest.php b/tests/Io/LengthLimitedStreamTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace React\Tests\Http;
+namespace React\Tests\Http\Io;
 
-use React\Http\LengthLimitedStream;
+use React\Http\Io\LengthLimitedStream;
 use React\Stream\ThroughStream;
+use React\Tests\Http\TestCase;
 
 class LengthLimitedStreamTest extends TestCase
 {
diff --git a/tests/Io/MultipartParserTest.php b/tests/Io/MultipartParserTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace React\Tests\Http\Middleware;
+namespace React\Tests\Http\Io\Middleware;
 
-use React\Http\Middleware\MultipartParser;
-use React\Http\ServerRequest;
+use React\Http\Io\MultipartParser;
+use React\Http\Io\ServerRequest;
 use React\Tests\Http\TestCase;
 
 final class MultipartParserTest extends TestCase
diff --git a/tests/Io/RequestHeaderParserTest.php b/tests/Io/RequestHeaderParserTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace React\Tests\Http;
+namespace React\Tests\Http\Io;
 
-use React\Http\RequestHeaderParser;
+use React\Http\Io\RequestHeaderParser;
+use React\Tests\Http\TestCase;
 
 class RequestHeaderParserTest extends TestCase
 {
diff --git a/tests/Io/ServerRequestTest.php b/tests/Io/ServerRequestTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace React\Tests\Http;
+namespace React\Tests\Http\Io;
 
-use React\Http\ServerRequest;
+use React\Http\Io\ServerRequest;
+use React\Tests\Http\TestCase;
 
 class ServerRequestTest extends TestCase
 {
diff --git a/tests/Io/UploadedFileTest.php b/tests/Io/UploadedFileTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace React\Tests\Http;
+namespace React\Tests\Http\Io;
 
-use React\Http\Response;
-use React\Http\UploadedFile;
-use React\Stream\ThroughStream;
+use React\Http\Io\UploadedFile;
+Use React\Tests\Http\TestCase;
 use RingCentral\Psr7\BufferStream;
 
 class UploadedFileTest extends TestCase
diff --git a/tests/Middleware/RequestBodyBufferMiddlewareTest.php b/tests/Middleware/RequestBodyBufferMiddlewareTest.php
@@ -3,12 +3,12 @@
 namespace React\Tests\Http\Middleware;
 
 use Psr\Http\Message\ServerRequestInterface;
+use React\Http\Io\HttpBodyStream;
+use React\Http\Io\ServerRequest;
 use React\Http\Middleware\RequestBodyBufferMiddleware;
-use React\Http\ServerRequest;
+use React\Stream\ThroughStream;
 use React\Tests\Http\TestCase;
 use RingCentral\Psr7\BufferStream;
-use React\Stream\ThroughStream;
-use React\Http\HttpBodyStream;
 
 final class RequestBodyBufferMiddlewareTest extends TestCase
 {
diff --git a/tests/Middleware/RequestBodyParserMiddlewareTest.php b/tests/Middleware/RequestBodyParserMiddlewareTest.php
@@ -3,8 +3,8 @@
 namespace React\Tests\Http\Middleware;
 
 use Psr\Http\Message\ServerRequestInterface;
+use React\Http\Io\ServerRequest;
 use React\Http\Middleware\RequestBodyParserMiddleware;
-use React\Http\ServerRequest;
 use React\Tests\Http\TestCase;
 
 final class RequestBodyParserMiddlewareTest extends TestCase
diff --git a/tests/MiddlewareRunnerTest.php b/tests/MiddlewareRunnerTest.php
@@ -2,15 +2,15 @@
 
 namespace React\Tests\Http;
 
+use Clue\React\Block;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use React\EventLoop\Factory;
+use React\Http\Io\ServerRequest;
 use React\Http\MiddlewareRunner;
-use React\Http\ServerRequest;
 use React\Promise;
 use React\Tests\Http\Middleware\ProcessStack;
 use RingCentral\Psr7\Response;
-use Clue\React\Block;
 
 final class MiddlewareRunnerTest extends TestCase
 {
diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
@@ -10,7 +10,7 @@ class ResponseTest extends TestCase
     public function testResponseBodyWillBeHttpBodyStream()
     {
         $response = new Response(200, array(), new ThroughStream());
-        $this->assertInstanceOf('React\Http\HttpBodyStream', $response->getBody());
+        $this->assertInstanceOf('React\Http\Io\HttpBodyStream', $response->getBody());
     }
 
     public function testStringBodyWillBePsr7Stream()
diff --git a/tests/benchmark-middleware-runner.php b/tests/benchmark-middleware-runner.php
@@ -1,9 +1,9 @@
 <?php
 
 use Psr\Http\Message\ServerRequestInterface;
+use React\Http\Io\ServerRequest;
 use React\Http\MiddlewareRunner;
 use React\Http\Response;
-use React\Http\ServerRequest;
 
 const ITERATIONS = 5000;
 const MIDDLEWARE_COUNT = 512;

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace React\Http\Middleware;`
`4`	`4`
`5`	`5`	`use Psr\Http\Message\ServerRequestInterface;`
	`6`	`+use React\Http\Io\MultipartParser;`
`6`	`7`
`7`	`8`	`final class RequestBodyParserMiddleware`
`8`	`9`	`{`