Refined project structure

georgique · Jul 11, 2024 · 4790449 · 4790449
1 parent ff8ed4c
commit 4790449
Show file tree

Hide file tree

Showing 20 changed files with 12 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → src/Action.php b/Action.php → 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 → src/Controller.php b/Controller.php → src/Controller.php
@@ -4,7 +4,6 @@
 
 use yii\filters\ContentNegotiator;
 use yii\web\Response;
-use Yii;
 
 /**
  * Class Controller

diff --git a/JsonRpcError.php → src/JsonRpcError.php b/JsonRpcError.php → src/JsonRpcError.php
diff --git a/JsonRpcRequest.php → src/JsonRpcRequest.php b/JsonRpcRequest.php → 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 → src/JsonRpcSerializer.php b/JsonRpcSerializer.php → 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 → src/exceptions/InternalErrorException.php b/exceptions/InternalErrorException.php → src/exceptions/InternalErrorException.php
diff --git a/exceptions/InvalidParamsException.php → src/exceptions/InvalidParamsException.php b/exceptions/InvalidParamsException.php → src/exceptions/InvalidParamsException.php
diff --git a/exceptions/InvalidRequestException.php → src/exceptions/InvalidRequestException.php b/exceptions/InvalidRequestException.php → src/exceptions/InvalidRequestException.php
diff --git a/exceptions/JsonRpcException.php → src/exceptions/JsonRpcException.php b/exceptions/JsonRpcException.php → 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 → src/exceptions/MethodNotFoundException.php b/exceptions/MethodNotFoundException.php → src/exceptions/MethodNotFoundException.php
diff --git a/exceptions/ParseErrorException.php → src/exceptions/ParseErrorException.php b/exceptions/ParseErrorException.php → src/exceptions/ParseErrorException.php
diff --git a/responses/ErrorResponse.php → src/responses/ErrorResponse.php b/responses/ErrorResponse.php → src/responses/ErrorResponse.php
diff --git a/responses/JsonRpcResponse.php → src/responses/JsonRpcResponse.php b/responses/JsonRpcResponse.php → src/responses/JsonRpcResponse.php
diff --git a/responses/SuccessResponse.php → src/responses/SuccessResponse.php b/responses/SuccessResponse.php → src/responses/SuccessResponse.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ @@
     namespace georgique\yii2\jsonrpc\exceptions;
-    use Throwable;
     use yii\base\Exception;
     /**
@@ Expand Down @@