From 4790449ea10aa5a772cd474b54a40541b2683d74 Mon Sep 17 00:00:00 2001
From: George Shestayev <george@uniques.ca>
Date: Thu, 11 Jul 2024 02:30:54 -0700
Subject: [PATCH] Refined project structure

---
 README.md                                                  | 6 ++++--
 composer.json                                              | 2 +-
 demo/controllers/BodyParamsJsonRpcController.php           | 2 +-
 demo/controllers/JsonRpcController.php                     | 2 +-
 demo/controllers/ObjectParamsJsonRpcController.php         | 2 +-
 demo/tests/api/JsonRpcCest.php                             | 1 -
 Action.php => src/Action.php                               | 2 +-
 Controller.php => src/Controller.php                       | 1 -
 JsonRpcError.php => src/JsonRpcError.php                   | 0
 JsonRpcRequest.php => src/JsonRpcRequest.php               | 6 +++---
 JsonRpcSerializer.php => src/JsonRpcSerializer.php         | 1 -
 {exceptions => src/exceptions}/InternalErrorException.php  | 0
 {exceptions => src/exceptions}/InvalidParamsException.php  | 0
 {exceptions => src/exceptions}/InvalidRequestException.php | 0
 {exceptions => src/exceptions}/JsonRpcException.php        | 1 -
 {exceptions => src/exceptions}/MethodNotFoundException.php | 0
 {exceptions => src/exceptions}/ParseErrorException.php     | 0
 {responses => src/responses}/ErrorResponse.php             | 0
 {responses => src/responses}/JsonRpcResponse.php           | 0
 {responses => src/responses}/SuccessResponse.php           | 0
 20 files changed, 12 insertions(+), 14 deletions(-)
 rename Action.php => src/Action.php (100%)
 rename Controller.php => src/Controller.php (99%)
 rename JsonRpcError.php => src/JsonRpcError.php (100%)
 rename JsonRpcRequest.php => src/JsonRpcRequest.php (100%)
 rename JsonRpcSerializer.php => src/JsonRpcSerializer.php (99%)
 rename {exceptions => src/exceptions}/InternalErrorException.php (100%)
 rename {exceptions => src/exceptions}/InvalidParamsException.php (100%)
 rename {exceptions => src/exceptions}/InvalidRequestException.php (100%)
 rename {exceptions => src/exceptions}/JsonRpcException.php (98%)
 rename {exceptions => src/exceptions}/MethodNotFoundException.php (100%)
 rename {exceptions => src/exceptions}/ParseErrorException.php (100%)
 rename {responses => src/responses}/ErrorResponse.php (100%)
 rename {responses => src/responses}/JsonRpcResponse.php (100%)
 rename {responses => src/responses}/SuccessResponse.php (100%)

diff --git a/README.md b/README.md
index 578bff1..b5e8bd7 100644
--- a/README.md
+++ b/README.md
@@ -13,11 +13,12 @@ therefore giving you Yii2 power fully.
 
 ## Usage
 Entry point:
+
 ```php
 <?php
 
 namespace app\controllers;
-use \georgique\yii2\jsonrpc\Controller;
+use georgique\yii2\jsonrpc\Controller;
 
 class JsonRpcController extends Controller {
 
@@ -28,11 +29,12 @@ class JsonRpcController extends Controller {
 ```
 
 Entry point with different way to pass params:
+
 ```php
 <?php
 
 namespace app\controllers;
-use \georgique\yii2\jsonrpc\Controller;
+use georgique\yii2\jsonrpc\Controller;
 
 class JsonRpcBodyController extends Controller {
 
diff --git a/composer.json b/composer.json
index 90c096e..d66c164 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
   ],
   "autoload": {
     "psr-4": {
-      "georgique\\yii2\\jsonrpc\\": ""
+      "georgique\\yii2\\jsonrpc\\": "src/"
     }
   },
   "repositories": [
diff --git a/demo/controllers/BodyParamsJsonRpcController.php b/demo/controllers/BodyParamsJsonRpcController.php
index cae3a39..b53691c 100644
--- a/demo/controllers/BodyParamsJsonRpcController.php
+++ b/demo/controllers/BodyParamsJsonRpcController.php
@@ -2,7 +2,7 @@
 
 namespace app\controllers;
 
-use \georgique\yii2\jsonrpc\Controller;
+use georgique\yii2\jsonrpc\Controller;
 
 class BodyParamsJsonRpcController extends Controller
 {
diff --git a/demo/controllers/JsonRpcController.php b/demo/controllers/JsonRpcController.php
index b4f5eba..50294b6 100644
--- a/demo/controllers/JsonRpcController.php
+++ b/demo/controllers/JsonRpcController.php
@@ -2,7 +2,7 @@
 
 namespace app\controllers;
 
-use \georgique\yii2\jsonrpc\Controller;
+use georgique\yii2\jsonrpc\Controller;
 
 class JsonRpcController extends Controller
 {
diff --git a/demo/controllers/ObjectParamsJsonRpcController.php b/demo/controllers/ObjectParamsJsonRpcController.php
index f8cfe85..a8dba73 100644
--- a/demo/controllers/ObjectParamsJsonRpcController.php
+++ b/demo/controllers/ObjectParamsJsonRpcController.php
@@ -2,7 +2,7 @@
 
 namespace app\controllers;
 
-use \georgique\yii2\jsonrpc\Controller;
+use georgique\yii2\jsonrpc\Controller;
 
 class ObjectParamsJsonRpcController extends Controller
 {
diff --git a/demo/tests/api/JsonRpcCest.php b/demo/tests/api/JsonRpcCest.php
index bdc6c83..4fa654d 100644
--- a/demo/tests/api/JsonRpcCest.php
+++ b/demo/tests/api/JsonRpcCest.php
@@ -1,7 +1,6 @@
 <?php
 namespace api\tests;
 
-use georgique\yii2\jsonrpc\exceptions\ParseErrorException;
 use tests\Tester;
 use yii\helpers\Json;
 
diff --git a/Action.php b/src/Action.php
similarity index 100%
rename from Action.php
rename to src/Action.php
index 13c9522..46153b3 100644
--- a/Action.php
+++ b/src/Action.php
@@ -2,9 +2,9 @@
 
 namespace georgique\yii2\jsonrpc;
 
-use georgique\yii2\jsonrpc\exceptions\JsonRpcException;
 use georgique\yii2\jsonrpc\exceptions\InternalErrorException;
 use georgique\yii2\jsonrpc\exceptions\InvalidRequestException;
+use georgique\yii2\jsonrpc\exceptions\JsonRpcException;
 use georgique\yii2\jsonrpc\exceptions\ParseErrorException;
 use georgique\yii2\jsonrpc\responses\ErrorResponse;
 use georgique\yii2\jsonrpc\responses\SuccessResponse;
diff --git a/Controller.php b/src/Controller.php
similarity index 99%
rename from Controller.php
rename to src/Controller.php
index a9220da..605f240 100644
--- a/Controller.php
+++ b/src/Controller.php
@@ -4,7 +4,6 @@
 
 use yii\filters\ContentNegotiator;
 use yii\web\Response;
-use Yii;
 
 /**
  * Class Controller
diff --git a/JsonRpcError.php b/src/JsonRpcError.php
similarity index 100%
rename from JsonRpcError.php
rename to src/JsonRpcError.php
diff --git a/JsonRpcRequest.php b/src/JsonRpcRequest.php
similarity index 100%
rename from JsonRpcRequest.php
rename to src/JsonRpcRequest.php
index e17387b..6875aac 100644
--- a/JsonRpcRequest.php
+++ b/src/JsonRpcRequest.php
@@ -2,10 +2,10 @@
 
 namespace georgique\yii2\jsonrpc;
 
-use georgique\yii2\jsonrpc\exceptions\InvalidRequestException;
-use georgique\yii2\jsonrpc\exceptions\JsonRpcException;
 use georgique\yii2\jsonrpc\exceptions\InternalErrorException;
 use georgique\yii2\jsonrpc\exceptions\InvalidParamsException;
+use georgique\yii2\jsonrpc\exceptions\InvalidRequestException;
+use georgique\yii2\jsonrpc\exceptions\JsonRpcException;
 use georgique\yii2\jsonrpc\exceptions\MethodNotFoundException;
 use yii\base\InlineAction;
 use yii\base\InvalidRouteException;
@@ -138,8 +138,8 @@ public function bindParamsArray($route, array $params)
 
     /**
      * Executes JSON-RPC request by route.
-     * @throws \georgique\yii2\jsonrpc\exceptions\JsonRpcException
      * @return mixed
+     * @throws \georgique\yii2\jsonrpc\exceptions\JsonRpcException
      */
     public function execute()
     {
diff --git a/JsonRpcSerializer.php b/src/JsonRpcSerializer.php
similarity index 99%
rename from JsonRpcSerializer.php
rename to src/JsonRpcSerializer.php
index fa70ccf..8e3018f 100644
--- a/JsonRpcSerializer.php
+++ b/src/JsonRpcSerializer.php
@@ -4,7 +4,6 @@
 
 use georgique\yii2\jsonrpc\exceptions\InternalErrorException;
 use georgique\yii2\jsonrpc\exceptions\JsonRpcException;
-use georgique\yii2\jsonrpc\JsonRpcError;
 use Yii;
 use yii\base\Arrayable;
 use yii\base\Component;
diff --git a/exceptions/InternalErrorException.php b/src/exceptions/InternalErrorException.php
similarity index 100%
rename from exceptions/InternalErrorException.php
rename to src/exceptions/InternalErrorException.php
diff --git a/exceptions/InvalidParamsException.php b/src/exceptions/InvalidParamsException.php
similarity index 100%
rename from exceptions/InvalidParamsException.php
rename to src/exceptions/InvalidParamsException.php
diff --git a/exceptions/InvalidRequestException.php b/src/exceptions/InvalidRequestException.php
similarity index 100%
rename from exceptions/InvalidRequestException.php
rename to src/exceptions/InvalidRequestException.php
diff --git a/exceptions/JsonRpcException.php b/src/exceptions/JsonRpcException.php
similarity index 98%
rename from exceptions/JsonRpcException.php
rename to src/exceptions/JsonRpcException.php
index 582cdf7..f16590f 100644
--- a/exceptions/JsonRpcException.php
+++ b/src/exceptions/JsonRpcException.php
@@ -2,7 +2,6 @@
 
 namespace georgique\yii2\jsonrpc\exceptions;
 
-use Throwable;
 use yii\base\Exception;
 
 /**
diff --git a/exceptions/MethodNotFoundException.php b/src/exceptions/MethodNotFoundException.php
similarity index 100%
rename from exceptions/MethodNotFoundException.php
rename to src/exceptions/MethodNotFoundException.php
diff --git a/exceptions/ParseErrorException.php b/src/exceptions/ParseErrorException.php
similarity index 100%
rename from exceptions/ParseErrorException.php
rename to src/exceptions/ParseErrorException.php
diff --git a/responses/ErrorResponse.php b/src/responses/ErrorResponse.php
similarity index 100%
rename from responses/ErrorResponse.php
rename to src/responses/ErrorResponse.php
diff --git a/responses/JsonRpcResponse.php b/src/responses/JsonRpcResponse.php
similarity index 100%
rename from responses/JsonRpcResponse.php
rename to src/responses/JsonRpcResponse.php
diff --git a/responses/SuccessResponse.php b/src/responses/SuccessResponse.php
similarity index 100%
rename from responses/SuccessResponse.php
rename to src/responses/SuccessResponse.php