Merge pull request #16 from DawidMazurek/psr-2-namespaces

DawidMazurek · web-flow · commit ec45f518b976 · 2018-03-28T20:42:22.000+02:00
Transform namespaces to PSR-2
diff --git a/examples/custromString.php b/examples/custromString.php
@@ -3,11 +3,11 @@
 declare(strict_types=1);
 
 use DawidMazurek\JsonRpc\handler\MethodCallableHandler;
-use DawidMazurek\JsonRpc\io\CustomStringInput;
-use DawidMazurek\JsonRpc\io\InputStream;
-use DawidMazurek\JsonRpc\io\JsonSerializer;
-use DawidMazurek\JsonRpc\request\JsonRpcRequestBuilder;
-use DawidMazurek\JsonRpc\server\JsonRpcServer;
+use DawidMazurek\JsonRpc\IO\CustomStringInput;
+use DawidMazurek\JsonRpc\IO\InputStream;
+use DawidMazurek\JsonRpc\IO\JsonSerializer;
+use DawidMazurek\JsonRpc\Request\JsonRpcRequestBuilder;
+use DawidMazurek\JsonRpc\Server\JsonRpcServer;
 
 include __DIR__ . '/../vendor/autoload.php';
 $requestBuilder = new JsonRpcRequestBuilder(new JsonSerializer());
diff --git a/examples/postInput.php b/examples/postInput.php
@@ -3,10 +3,10 @@
 declare(strict_types=1);
 
 use DawidMazurek\JsonRpc\handler\MethodCallableHandler;
-use DawidMazurek\JsonRpc\io\InputStream;
-use DawidMazurek\JsonRpc\io\JsonSerializer;
-use DawidMazurek\JsonRpc\request\JsonRpcRequestBuilder;
-use DawidMazurek\JsonRpc\server\JsonRpcServer;
+use DawidMazurek\JsonRpc\IO\InputStream;
+use DawidMazurek\JsonRpc\IO\JsonSerializer;
+use DawidMazurek\JsonRpc\Request\JsonRpcRequestBuilder;
+use DawidMazurek\JsonRpc\Server\JsonRpcServer;
 
 include __DIR__ . '/../vendor/autoload.php';
 $requestBuilder = new JsonRpcRequestBuilder(new JsonSerializer());
diff --git a/src/Error/JsonRpcErrorCodes.php b/src/Error/JsonRpcErrorCodes.php
@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\error;
+namespace DawidMazurek\JsonRpc\Error;
 
 class JsonRpcErrorCodes
 {
diff --git a/src/Exception/InvalidParams.php b/src/Exception/InvalidParams.php
@@ -2,9 +2,9 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\exception;
+namespace DawidMazurek\JsonRpc\Exception;
 
-use DawidMazurek\JsonRpc\error\JsonRpcErrorCodes;
+use DawidMazurek\JsonRpc\Error\JsonRpcErrorCodes;
 
 class InvalidParams extends JsonRpcException
 {
diff --git a/src/Exception/InvalidRequest.php b/src/Exception/InvalidRequest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\exception;
+namespace DawidMazurek\JsonRpc\Exception;
 
-use DawidMazurek\JsonRpc\error\JsonRpcErrorCodes;
+use DawidMazurek\JsonRpc\Error\JsonRpcErrorCodes;
 
 class InvalidRequest extends JsonRpcException
 {
diff --git a/src/Exception/JsonRpcException.php b/src/Exception/JsonRpcException.php
@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\exception;
+namespace DawidMazurek\JsonRpc\Exception;
 
 use Exception;
 
diff --git a/src/Exception/MethodNotFound.php b/src/Exception/MethodNotFound.php
@@ -2,9 +2,9 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\exception;
+namespace DawidMazurek\JsonRpc\Exception;
 
-use DawidMazurek\JsonRpc\error\JsonRpcErrorCodes;
+use DawidMazurek\JsonRpc\Error\JsonRpcErrorCodes;
 
 class MethodNotFound extends JsonRpcException
 {
diff --git a/src/Exception/ParseError.php b/src/Exception/ParseError.php
@@ -2,9 +2,9 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\exception;
+namespace DawidMazurek\JsonRpc\Exception;
 
-use DawidMazurek\JsonRpc\error\JsonRpcErrorCodes;
+use DawidMazurek\JsonRpc\Error\JsonRpcErrorCodes;
 
 class ParseError extends JsonRpcException
 {
diff --git a/src/Handler/JsonRpcRequestHandler.php b/src/Handler/JsonRpcRequestHandler.php
@@ -2,11 +2,11 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\handler;
+namespace DawidMazurek\JsonRpc\Handler;
 
-use DawidMazurek\JsonRpc\exception\JsonRpcException;
-use DawidMazurek\JsonRpc\request\JsonRpcRequest;
-use DawidMazurek\JsonRpc\response\JsonRpcResponse;
+use DawidMazurek\JsonRpc\Exception\JsonRpcException;
+use DawidMazurek\JsonRpc\Request\JsonRpcRequest;
+use DawidMazurek\JsonRpc\Response\JsonRpcResponse;
 
 interface JsonRpcRequestHandler
 {
diff --git a/src/Handler/MethodCallableHandler.php b/src/Handler/MethodCallableHandler.php
@@ -2,16 +2,16 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\handler;
+namespace DawidMazurek\JsonRpc\Handler;
 
-use DawidMazurek\JsonRpc\exception\JsonRpcException;
-use DawidMazurek\JsonRpc\exception\MethodNotFound;
-use DawidMazurek\JsonRpc\request\JsonRpcRequest;
-use DawidMazurek\JsonRpc\request\Request;
-use DawidMazurek\JsonRpc\response\FailedResponse;
-use DawidMazurek\JsonRpc\response\JsonRpcResponse;
-use DawidMazurek\JsonRpc\response\NotificationResponse;
-use DawidMazurek\JsonRpc\response\Response;
+use DawidMazurek\JsonRpc\Exception\JsonRpcException;
+use DawidMazurek\JsonRpc\Exception\MethodNotFound;
+use DawidMazurek\JsonRpc\Request\JsonRpcRequest;
+use DawidMazurek\JsonRpc\Request\Request;
+use DawidMazurek\JsonRpc\Response\FailedResponse;
+use DawidMazurek\JsonRpc\Response\JsonRpcResponse;
+use DawidMazurek\JsonRpc\Response\NotificationResponse;
+use DawidMazurek\JsonRpc\Response\Response;
 
 class MethodCallableHandler implements JsonRpcRequestHandler
 {
diff --git a/src/IO/CustomStringInput.php b/src/IO/CustomStringInput.php
@@ -2,10 +2,10 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\io;
+namespace DawidMazurek\JsonRpc\IO;
 
-use DawidMazurek\JsonRpc\request\JsonRpcRequestAggregate;
-use DawidMazurek\JsonRpc\request\JsonRpcRequestBuilder;
+use DawidMazurek\JsonRpc\Request\JsonRpcRequestAggregate;
+use DawidMazurek\JsonRpc\Request\JsonRpcRequestBuilder;
 
 class CustomStringInput implements JsonRpcInput
 {
diff --git a/src/IO/InputStream.php b/src/IO/InputStream.php
@@ -2,10 +2,10 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\io;
+namespace DawidMazurek\JsonRpc\IO;
 
-use DawidMazurek\JsonRpc\request\JsonRpcRequestAggregate;
-use DawidMazurek\JsonRpc\request\JsonRpcRequestBuilder;
+use DawidMazurek\JsonRpc\Request\JsonRpcRequestAggregate;
+use DawidMazurek\JsonRpc\Request\JsonRpcRequestBuilder;
 
 class InputStream implements JsonRpcInput
 {
diff --git a/src/IO/JsonRpcInput.php b/src/IO/JsonRpcInput.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DawidMazurek\JsonRpc\io;
+namespace DawidMazurek\JsonRpc\IO;
 
-use DawidMazurek\JsonRpc\request\JsonRpcRequestAggregate;
+use DawidMazurek\JsonRpc\Request\JsonRpcRequestAggregate;
 
 interface JsonRpcInput
 {
diff --git a/src/IO/JsonSerializer.php b/src/IO/JsonSerializer.php
@@ -2,9 +2,9 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\io;
+namespace DawidMazurek\JsonRpc\IO;
 
-use DawidMazurek\JsonRpc\exception\ParseError;
+use DawidMazurek\JsonRpc\Exception\ParseError;
 
 class JsonSerializer
 {
diff --git a/src/Request/IdentifiedJsonRpcRequest.php b/src/Request/IdentifiedJsonRpcRequest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\request;
+namespace DawidMazurek\JsonRpc\Request;
 
 interface IdentifiedJsonRpcRequest extends JsonRpcRequest
 {
diff --git a/src/Request/JsonRpcRequest.php b/src/Request/JsonRpcRequest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\request;
+namespace DawidMazurek\JsonRpc\Request;
 
 interface JsonRpcRequest
 {
diff --git a/src/Request/JsonRpcRequestAggregate.php b/src/Request/JsonRpcRequestAggregate.php
@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\request;
+namespace DawidMazurek\JsonRpc\Request;
 
 class JsonRpcRequestAggregate
 {
diff --git a/src/Request/JsonRpcRequestBuilder.php b/src/Request/JsonRpcRequestBuilder.php
@@ -2,10 +2,10 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\request;
+namespace DawidMazurek\JsonRpc\Request;
 
-use DawidMazurek\JsonRpc\exception\InvalidParams;
-use DawidMazurek\JsonRpc\io\JsonSerializer;
+use DawidMazurek\JsonRpc\Exception\InvalidParams;
+use DawidMazurek\JsonRpc\IO\JsonSerializer;
 
 class JsonRpcRequestBuilder
 {
diff --git a/src/Request/Notification.php b/src/Request/Notification.php
@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\request;
+namespace DawidMazurek\JsonRpc\Request;
 
 class Notification implements JsonRpcRequest
 {
diff --git a/src/Request/Request.php b/src/Request/Request.php
@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\request;
+namespace DawidMazurek\JsonRpc\Request;
 
 class Request implements IdentifiedJsonRpcRequest
 {
diff --git a/src/Response/FailedResponse.php b/src/Response/FailedResponse.php
@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\response;
+namespace DawidMazurek\JsonRpc\Response;
 
 class FailedResponse implements JsonRpcResponse
 {
diff --git a/src/Response/JsonRpcResponse.php b/src/Response/JsonRpcResponse.php
@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\response;
+namespace DawidMazurek\JsonRpc\Response;
 
 interface JsonRpcResponse
 {
diff --git a/src/Response/JsonRpcResponseAggregate.php b/src/Response/JsonRpcResponseAggregate.php
@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\response;
+namespace DawidMazurek\JsonRpc\Response;
 
 class JsonRpcResponseAggregate
 {
diff --git a/src/Response/NotificationResponse.php b/src/Response/NotificationResponse.php
@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\response;
+namespace DawidMazurek\JsonRpc\Response;
 
 class NotificationResponse implements JsonRpcResponse
 {
diff --git a/src/Response/Response.php b/src/Response/Response.php
@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\response;
+namespace DawidMazurek\JsonRpc\Response;
 
 class Response implements JsonRpcResponse
 {
diff --git a/src/Server/JsonRpcServer.php b/src/Server/JsonRpcServer.php
@@ -2,12 +2,12 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\server;
+namespace DawidMazurek\JsonRpc\Server;
 
-use DawidMazurek\JsonRpc\exception\JsonRpcException;
-use DawidMazurek\JsonRpc\handler\JsonRpcRequestHandler;
-use DawidMazurek\JsonRpc\io\JsonRpcInput;
-use DawidMazurek\JsonRpc\response\JsonRpcResponseAggregate;
+use DawidMazurek\JsonRpc\Exception\JsonRpcException;
+use DawidMazurek\JsonRpc\Handler\JsonRpcRequestHandler;
+use DawidMazurek\JsonRpc\IO\JsonRpcInput;
+use DawidMazurek\JsonRpc\Response\JsonRpcResponseAggregate;
 
 class JsonRpcServer
 {
diff --git a/tests/integration/JsonRpcServerIntegrationTest.php b/tests/integration/JsonRpcServerIntegrationTest.php
@@ -2,12 +2,12 @@
 
 declare(strict_types = 1);
 
-use DawidMazurek\JsonRpc\handler\MethodCallableHandler;
-use DawidMazurek\JsonRpc\io\CustomStringInput;
-use DawidMazurek\JsonRpc\io\JsonSerializer;
-use DawidMazurek\JsonRpc\request\JsonRpcRequestBuilder;
-use DawidMazurek\JsonRpc\response\JsonRpcResponseAggregate;
-use DawidMazurek\JsonRpc\server\JsonRpcServer;
+use DawidMazurek\JsonRpc\Handler\MethodCallableHandler;
+use DawidMazurek\JsonRpc\IO\CustomStringInput;
+use DawidMazurek\JsonRpc\IO\JsonSerializer;
+use DawidMazurek\JsonRpc\Request\JsonRpcRequestBuilder;
+use DawidMazurek\JsonRpc\Response\JsonRpcResponseAggregate;
+use DawidMazurek\JsonRpc\Server\JsonRpcServer;
 use PHPUnit\Framework\TestCase;
 
 class JsonRpcServerIntegrationTest extends TestCase
diff --git a/tests/unit/Exception/InvalidParamsTest.php b/tests/unit/Exception/InvalidParamsTest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\exception;
+namespace DawidMazurek\JsonRpc\Exception;
 
-use DawidMazurek\JsonRpc\error\JsonRpcErrorCodes;
+use DawidMazurek\JsonRpc\Error\JsonRpcErrorCodes;
 use PHPUnit\Framework\TestCase;
 
 class InvalidParamsTest extends TestCase
diff --git a/tests/unit/Exception/InvalidRequestTest.php b/tests/unit/Exception/InvalidRequestTest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\exception;
+namespace DawidMazurek\JsonRpc\Exception;
 
-use DawidMazurek\JsonRpc\error\JsonRpcErrorCodes;
+use DawidMazurek\JsonRpc\Error\JsonRpcErrorCodes;
 use PHPUnit\Framework\TestCase;
 
 class InvalidRequestTest extends TestCase
diff --git a/tests/unit/Exception/MethodNotFoundTest.php b/tests/unit/Exception/MethodNotFoundTest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\exception;
+namespace DawidMazurek\JsonRpc\Exception;
 
-use DawidMazurek\JsonRpc\error\JsonRpcErrorCodes;
+use DawidMazurek\JsonRpc\Error\JsonRpcErrorCodes;
 use PHPUnit\Framework\TestCase;
 
 class MethodNotFoundTest extends TestCase
diff --git a/tests/unit/Exception/ParseErrorTest.php b/tests/unit/Exception/ParseErrorTest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types = 1);
 
-namespace DawidMazurek\JsonRpc\exception;
+namespace DawidMazurek\JsonRpc\Exception;
 
-use DawidMazurek\JsonRpc\error\JsonRpcErrorCodes;
+use DawidMazurek\JsonRpc\Error\JsonRpcErrorCodes;
 use PHPUnit\Framework\TestCase;
 
 class ParseErrorTest extends TestCase
diff --git a/tests/unit/Handler/MethodCallableHandlerTest.php b/tests/unit/Handler/MethodCallableHandlerTest.php
diff --git a/tests/unit/IO/CustomStringInputTest.php b/tests/unit/IO/CustomStringInputTest.php
diff --git a/tests/unit/IO/InputStreamTest.php b/tests/unit/IO/InputStreamTest.php
diff --git a/tests/unit/IO/JsonSerializerTest.php b/tests/unit/IO/JsonSerializerTest.php
diff --git a/tests/unit/Request/JsonRpcRequestBuilderTest.php b/tests/unit/Request/JsonRpcRequestBuilderTest.php
diff --git a/tests/unit/Request/NotificationTest.php b/tests/unit/Request/NotificationTest.php
diff --git a/tests/unit/Request/RequestTest.php b/tests/unit/Request/RequestTest.php
diff --git a/tests/unit/Response/FailedResponseTest.php b/tests/unit/Response/FailedResponseTest.php
diff --git a/tests/unit/Response/JsonRpcResponseAggregateTest.php b/tests/unit/Response/JsonRpcResponseAggregateTest.php
diff --git a/tests/unit/Response/NotificationResponseTest.php b/tests/unit/Response/NotificationResponseTest.php
diff --git a/tests/unit/Response/ResponseTest.php b/tests/unit/Response/ResponseTest.php
diff --git a/tests/unit/Server/JsonRpcServerTest.php b/tests/unit/Server/JsonRpcServerTest.php

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`declare(strict_types = 1);`
`4`	`4`
`5`		`-namespace DawidMazurek\JsonRpc\error;`
	`5`	`+namespace DawidMazurek\JsonRpc\Error;`
`6`	`6`
`7`	`7`	`class JsonRpcErrorCodes`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`declare(strict_types = 1);`
`4`	`4`
`5`		`-namespace DawidMazurek\JsonRpc\exception;`
	`5`	`+namespace DawidMazurek\JsonRpc\Exception;`
`6`	`6`
`7`		`-use DawidMazurek\JsonRpc\error\JsonRpcErrorCodes;`
	`7`	`+use DawidMazurek\JsonRpc\Error\JsonRpcErrorCodes;`
`8`	`8`
`9`	`9`	`class InvalidParams extends JsonRpcException`
`10`	`10`	`{`