Changes to some property names

MikeRow · Jul 4, 2020 · cdf4eef · cdf4eef
1 parent 155cb9a
commit cdf4eef
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 20 deletions.
diff --git a/src/NanoIPC.php b/src/NanoIPC.php
@@ -20,7 +20,7 @@ class NanoIPC
     private $context;
     private $nanoPreamble;
     private $nanoEncoding;
-    private $nanoAPIKey;
+    private $nanoApiKey;
     private $id = 0;
 
 
@@ -151,13 +151,13 @@ public function setNanoEncoding(int $nano_encoding)
     // ## Set Nano API key
     // #
 
-    public function setNanoAPIKey(string $nano_api_key = null)
+    public function setNanoApiKey(string $nano_api_key = null)
     {
         if (empty($nano_api_key)){
             throw new NanoIPCException("Invalid Nano API key: $nano_api_key");
         }
 
-        $this->nanoAPIKey = $nano_api_key;
+        $this->nanoApiKey = $nano_api_key;
     }
 
 
@@ -258,6 +258,7 @@ public function __call($method, array $params)
         ) {
             $request = $arguments;
             $request['action'] = $method;
+
         // 4
         } elseif ($this->nanoEncoding == 4) {
             $request = [
@@ -267,8 +268,8 @@ public function __call($method, array $params)
             ];
 
             // Nano API key
-            if ($this->nanoAPIKey != null) {
-                $request['credentials'] = $this->nanoAPIKey;
+            if ($this->nanoApiKey != null) {
+                $request['credentials'] = $this->nanoApiKey;
             }
         } else {
             //
@@ -329,6 +330,7 @@ public function __call($method, array $params)
             if (isset($this->response['error'])) {
                 $this->error = $this->response['error'];
             }
+
         // 4
         } elseif ($this->nanoEncoding == 4) {
             $this->responseType = $this->response['message_type'];

diff --git a/src/NanoRPC.php b/src/NanoRPC.php
@@ -15,8 +15,8 @@ class NanoRPC
     private $port;
     private $url;
     private $options;
-    private $nanoAPI;
-    private $nanoAPIKey;
+    private $nanoApi;
+    private $nanoApiKey;
     private $id = 0;
 
 
@@ -68,7 +68,7 @@ public function __construct(
         $this->hostname = $hostname;
         $this->port     = $port;
         $this->url      = $url;
-        $this->nanoAPI  = 1;
+        $this->nanoApi  = 1;
 
         $this->options =
         [
@@ -91,29 +91,29 @@ public function __construct(
     // ## Set Nano API
     // #
 
-    public function setNanoAPI(int $nano_api)
+    public function setNanoApi(int $nano_api)
     {
         if ($nano_api != 1 &&
             $nano_api != 2
         ) {
             throw new NanoRPCException("Invalid Nano API: $nano_api");
         }
 
-        $this->nanoAPI = $nano_api;
+        $this->nanoApi = $nano_api;
     }
 
 
     // #
     // ## Set Nano API key
     // #
 
-    public function setNanoAPIKey(string $nano_api_key = null)
+    public function setNanoApiKey(string $nano_api_key = null)
     {
         if (empty($nano_api_key)){
             throw new NanoRPCException("Invalid Nano API key: $nano_api_key");
         }
 
-        $this->nanoAPIKey = $nano_api_key;
+        $this->nanoApiKey = $nano_api_key;
     }
 
 
@@ -147,20 +147,21 @@ public function __call($method, array $params)
         // # API switch
 
         // v1
-        if ($this->nanoAPI == 1) {
+        if ($this->nanoApi == 1) {
             $request = $arguments;
-            $request['action'] = $method;   
+            $request['action'] = $method; 
+
         // v2
-        } elseif ($this->nanoAPI == 2) {
+        } elseif ($this->nanoApi == 2) {
             $request = [
                 'correlation_id' => (string) $this->id,
                 'message_type'   => $method,
                 'message'        => $arguments
             ];
 
             // Nano API key
-            if ($this->nanoAPIKey != null) {
-                $request['credentials'] = $this->nanoAPIKey;
+            if ($this->nanoApiKey != null) {
+                $request['credentials'] = $this->nanoApiKey;
             }
         } else {
             //
@@ -195,12 +196,13 @@ public function __call($method, array $params)
         // # API switch
 
         // v1
-        if ($this->nanoAPI == 1) {
+        if ($this->nanoApi == 1) {
             if (isset($this->response['error'])) {
                 $this->error = $this->response['error'];
             }
+
         // v2
-        } elseif ($this->nanoAPI == 2) {
+        } elseif ($this->nanoApi == 2) {
             $this->responseType = $this->response['message_type'];
 
             $this->responseTime = (int) $this->response['time'];

diff --git a/test/NanoRPC.php b/test/NanoRPC.php
@@ -22,7 +22,7 @@
 
 $nanorpc = new php4nano\NanoRPC('http', 'localhost', 7076, 'api/v2');
 
-$nanorpc->setAPI(2);
+$nanorpc->setNanoApi(2);
 
 $account = 'nano_3dyo9e7wkf8kuykghbjdt78njux3yudhdrhtwaymc8fsmxhxpt1h48zffbse';