Fix classes autoloading

sergeyfast · Apr 5, 2021 · 8d1512a · 8d1512a
1 parent 8480b59
commit 8d1512a
Show file tree

Hide file tree

Showing 7 changed files with 94 additions and 85 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,9 @@
   },
   "target-dir":"",
   "require":{
-    "php":">=5.4.0"
+    "php":">=5.4.0",
+    "ext-curl": "*",
+    "ext-json": "*"
   },
   "require-dev":{
     "phpunit/phpunit": "4.8.*"

diff --git a/src/EazyJsonRpc/BaseJsonRpcCall.php b/src/EazyJsonRpc/BaseJsonRpcCall.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace EazyJsonRpc;
+
+/**
+ * Base Json Rpc Call
+ * @package    Eaze
+ * @subpackage Model
+ * @author     Sergeyfast
+ * @link       http://www.jsonrpc.org/specification
+ */
+class BaseJsonRpcCall
+{
+
+    /** @var int */
+    public $Id;
+
+    /** @var string */
+    public $Method;
+
+    /** @var array */
+    public $Params;
+
+    /** @var array */
+    public $Error;
+
+    /** @var mixed */
+    public $Result;
+
+
+    /**
+     * Has Error
+     * @return bool
+     */
+    public function HasError()
+    {
+        return (bool)$this->Error;
+    }
+
+
+    /**
+     * @param string $method
+     * @param array $params
+     * @param string $id
+     */
+    public function __construct($method, $params, $id)
+    {
+        $this->Method = $method;
+        $this->Params = $params;
+        $this->Id = $id;
+    }
+
+
+    /**
+     * Get Call Data
+     * @param BaseJsonRpcCall $call
+     * @return array
+     */
+    public static function GetCallData(BaseJsonRpcCall $call)
+    {
+        return [
+            'jsonrpc' => '2.0',
+            'id' => $call->Id,
+            'method' => $call->Method,
+            'params' => $call->Params,
+        ];
+    }
+
+
+    /**
+     * Set Result
+     * @param mixed $data
+     * @param bool $useObjects
+     */
+    public function SetResult($data, $useObjects = false)
+    {
+        if ($useObjects) {
+            $this->Error = property_exists($data, 'error') ? $data->error : null;
+            $this->Result = property_exists($data, 'result') ? $data->result : null;
+        } else {
+            $this->Error = !empty($data['error']) ? $data['error'] : null;
+            $this->Result = !empty($data['result']) ? $data['result'] : null;
+        }
+    }
+}
diff --git a/src/BaseJsonRpcClient.php → src/EazyJsonRpc/BaseJsonRpcClient.php b/src/BaseJsonRpcClient.php → src/EazyJsonRpc/BaseJsonRpcClient.php
@@ -159,7 +159,7 @@ public function __call( $method, array $parameters = [ ] ) {
         protected function processCalls( $calls ) {
             // Prepare Data
             $singleCall = !$this->isBatchCall ? reset( $calls ) : null;
-            $result     = $this->batchCalls ? array_values( array_map( '\EazyJsonRpc\BaseJsonRpcCall::GetCallData', $calls ) ) : BaseJsonRpcCall::GetCallData( $singleCall );
+            $result     = $this->batchCalls ? array_values( array_map( '\EazyJsonRpc\BaseJsonRpcCall', $calls ) ) : BaseJsonRpcCall::GetCallData( $singleCall );
 
             // Send Curl Request
             $options = $this->CurlOptions + [ CURLOPT_POSTFIELDS => json_encode( $result ) ];
@@ -189,81 +189,3 @@ protected function processCalls( $calls ) {
         }
     }
 
-
-    /**
-     * Base Json Rpc Call
-     * @package    Eaze
-     * @subpackage Model
-     * @author     Sergeyfast
-     * @link       http://www.jsonrpc.org/specification
-     */
-    class BaseJsonRpcCall {
-
-        /** @var int */
-        public $Id;
-
-        /** @var string */
-        public $Method;
-
-        /** @var array */
-        public $Params;
-
-        /** @var array */
-        public $Error;
-
-        /** @var mixed */
-        public $Result;
-
-
-        /**
-         * Has Error
-         * @return bool
-         */
-        public function HasError() {
-            return (bool) $this->Error;
-        }
-
-
-        /**
-         * @param string $method
-         * @param array  $params
-         * @param string $id
-         */
-        public function __construct( $method, $params, $id ) {
-            $this->Method = $method;
-            $this->Params = $params;
-            $this->Id     = $id;
-        }
-
-
-        /**
-         * Get Call Data
-         * @param BaseJsonRpcCall $call
-         * @return array
-         */
-        public static function GetCallData( BaseJsonRpcCall $call ) {
-            return [
-                'jsonrpc' => '2.0',
-                'id'      => $call->Id,
-                'method'  => $call->Method,
-                'params'  => $call->Params,
-            ];
-        }
-
-
-        /**
-         * Set Result
-         * @param mixed $data
-         * @param bool  $useObjects
-         */
-        public function SetResult( $data, $useObjects = false ) {
-            if ( $useObjects ) {
-                $this->Error  = property_exists( $data, 'error' ) ? $data->error : null;
-                $this->Result = property_exists( $data, 'result' ) ? $data->result : null;
-            } else {
-                $this->Error  = !empty( $data['error'] ) ? $data['error'] : null;
-                $this->Result = !empty( $data['result'] ) ? $data['result'] : null;
-            }
-        }
-    }
-
diff --git a/src/BaseJsonRpcServer.php → src/EazyJsonRpc/BaseJsonRpcServer.php b/src/BaseJsonRpcServer.php → src/EazyJsonRpc/BaseJsonRpcServer.php
diff --git a/src/BaseJsonRpcServerSmd.php → src/EazyJsonRpc/BaseJsonRpcServerSmd.php b/src/BaseJsonRpcServerSmd.php → src/EazyJsonRpc/BaseJsonRpcServerSmd.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,7 +1,7 @@
 <?php
-    include '../src/BaseJsonRpcServer.php';
-    include '../src/BaseJsonRpcServerSmd.php';
-    include '../src/BaseJsonRpcClient.php';
+    include '../src/EazyJsonRpc/BaseJsonRpcServer.php';
+    include '../src/EazyJsonRpc/BaseJsonRpcServerSmd.php';
+    include '../src/EazyJsonRpc/BaseJsonRpcClient.php';
     include 'lib/DateTimeService.php';
     include 'lib/DateTimeServiceClient.php';
     include 'lib/DatePingServiceClient.php';

diff --git a/tests/example-server.php b/tests/example-server.php
@@ -1,8 +1,8 @@
 <?php
     use EazyJsonRpc\BaseJsonRpcServer;
 
-    include '../src/BaseJsonRpcServer.php';
-    include '../src/BaseJsonRpcServerSmd.php';
+    include '../src/EazyJsonRpc/BaseJsonRpcServer.php';
+    include '../src/EazyJsonRpc/BaseJsonRpcServerSmd.php';
     include 'lib/DateTimeService.php';
     include 'lib/PingService.php';
     include 'lib/DateTimeRpcService.php';