Minor refactoring and cleanup

- Renaming "AbstractClient" to "AbstractApiClient"
- Renaming "Client" to "Consul", as having 2 different things named "Client" was dumb.
- Minor performance improvements

Author: dcarbone

README.md

@@ -24,16 +24,19 @@ First, construct a [Config](./src/Config.php) object:
 $config = new \DCarbone\PHPConsulAPI\Config(['Address' => 'address of your consul agent']);
 ```
 
-Next, construct a [Client](./src/Client.php) object:
+Next, construct a [Consul](./src/Consul.php) object:
 
 ```php
-$client = new \DCarbone\PHPConsulAPI\Client($config);
+$consul = new \DCarbone\PHPConsulAPI\Consul($config);
 ```
 
 Once constructed, you interact with each Consul API via it's corresponding Client class:
 
 ```php
-$kv_list = $client->KV->keys();
+list($kv_list, $qm, $err) = $consul->KV->keys();
+if (null !== $err)
+    die($err);
+
 var_dump($kv_list);
 ```
 

docs/AGENT.md

@@ -3,18 +3,18 @@
 All interactions with the [`v1/agent`](https://www.consul.io/docs/agent/http/agent.html) endpoint are done
 via the [AgentClient](../src/Agent/AgentClient.php) class.
 
-If you have constructed a [Client](../src/Client.php) object, this is done as so:
+If you have constructed a [Consul](../src/Consul.php) object, this is done as so:
 
 ```php
-$agent = $client->Agent;
+$agent = $consul->Agent;
 ```
 
 ## Actions
 
 ### Get "Self"
 
 ```php
-list($self, $qm, $err) = $client->Agent->self();
+list($self, $qm, $err) = $consul->Agent->self();
 if (null !== $err)
     die($err);
 
@@ -24,7 +24,7 @@ var_dump($qm, $self);
 ### Get Name of Node
 
 ```php
-list($nodeName, $err) = $client->Agent->nodeName();
+list($nodeName, $err) = $consul->Agent->nodeName();
 if (null !== $err)
     die($err);
 
@@ -34,7 +34,7 @@ var_dump($nodeName);
 ### Get List of Agent Checks
 
 ```php
-list($checks, $err) = $client->Agent->checks();
+list($checks, $err) = $consul->Agent->checks();
 if (null !== $err)
     die($err);
 
@@ -44,7 +44,7 @@ var_dump($checks);
 ### Get List of Agent Services
 
 ```php
-list($services, $err) = $client->Agent->services();
+list($services, $err) = $consul->Agent->services();
 if (null !== $err)
     die($err);
 
@@ -54,7 +54,7 @@ var_dump($services);
 ### Get List of Cluster Members
 
 ```php
-list($members, $err) = $client->Agent->members();
+list($members, $err) = $consul->Agent->members();
 if (null !== $err)
     die($err);
 
@@ -79,15 +79,15 @@ $service = new \DCarbone\PHPConsulAPI\Agent\AgentServiceRegistration(
     )
 );
 
-$err = $client->Agent->serviceRegister($service);
+$err = $consul->Agent->serviceRegister($service);
 if (null !== $err)
     die($err);
 ```
 
 ### Deregister Service
 
 ```php
-$err = $client->Agent->serviceDeregister('dan test service');
+$err = $consul->Agent->serviceDeregister('dan test service');
 if (null !== $err)
     die($err);
 ```
@@ -107,87 +107,87 @@ $check = new \DCarbone\PHPConsulAPI\Agent\AgentCheckRegistration(
     )
 );
 
-$err = $client->Agent->checkRegister($check);
+$err = $consul->Agent->checkRegister($check);
 if (null !== $err)
     die($err);
 ```
 
 ### Deregister Agent Check
 
 ```php
-$err = $client->Agent()->checkDeregister('dan test service check');
+$err = $consul->Agent()->checkDeregister('dan test service check');
 if (null !== $err)
     die($err);
 ```
 
 ### Join
 
 ```php
-$err = $client->Agent->join('address to join');
+$err = $consul->Agent->join('address to join');
 if (null !== $err)
     die($err);
 ```
 
 ### Force Leave
 
 ```php
-$err = $client->Agent->forceLeave('node name');
+$err = $consul->Agent->forceLeave('node name');
 if (null !== $err)
     die($err);
 ```
 
 ### Enable Service Maintenance
 
 ```php
-$err = $client->Agent->enableServiceMaintenance('service id', 'because reasons');
+$err = $consul->Agent->enableServiceMaintenance('service id', 'because reasons');
 if (null !== $err)
     die($err);
 ```
 
 ### Disable Service Maintenance
 
 ```php
-$err = $client->Agent->disableServiceMaintenance('service id');
+$err = $consul->Agent->disableServiceMaintenance('service id');
 if (null !== $er)
     die($err);
 ```
 
 ### Enable Node Maintenance
 
 ```php
-$err = $client->Agent->enableNodeMaintenance('because GOOD reasons');
+$err = $consul->Agent->enableNodeMaintenance('because GOOD reasons');
 if (null !== $err)
     die($err);
 ```
 
 ### Disable Node Maintenance
 
 ```php
-$err = $client->Agent->disableNodeMaintenance();
+$err = $consul->Agent->disableNodeMaintenance();
 if (null !== $err)
     die($err);
 ```
 
 ### Set TTL Check to Passing
 
 ```php
-$err = $client->Agent->passTTL('check id', 'all good here, dudes');
+$err = $consul->Agent->passTTL('check id', 'all good here, dudes');
 if (null !== $err)
     die($err);
 ```
 
 ### Set TTL Check to Warning
 
 ```php
-$err = $client->Agent->warnTTL('check id', 'might not be good here, dudes');
+$err = $consul->Agent->warnTTL('check id', 'might not be good here, dudes');
 if (null !== $err)
     die($err);
 ```
 
 ### Set TTL Check to Failing
 
 ```php
-$err = $client->Agent->failTTL('check id', 'super not good here, dudes.');
+$err = $consul->Agent->failTTL('check id', 'super not good here, dudes.');
 if (null !== $err)
     die($err);
 ```

docs/CATALOG.md

@@ -3,10 +3,10 @@
 All interactions with the [`v1/catalog`](https://www.consul.io/docs/agent/http/catalog.html) endpoint are done
 via the [CatalogClient](../src/Catalog/CatalogClient.php) class.
 
-If you have constructed a [Client](../src/Client.php) object, this is done as so:
+If you have constructed a [Consul](../src/Consul.php) object, this is done as so:
 
 ```php
-$catalog = $client->Catalog;
+$catalog = $consul->Catalog;
 ```
 
 ## Actions
@@ -29,7 +29,7 @@ $catalogRegistration = new \DCarbone\PHPConsulAPI\Catalog\CatalogRegistration(
     )
 );
 
-list($wm, $err) = $client->Catalog->register($catalogRegistration);
+list($wm, $err) = $consul->Catalog->register($catalogRegistration);
 if (null !== $err)
     die($err);
 
@@ -51,7 +51,7 @@ $catalogDeregistration = new \DCarbone\PHPConsulAPI\Catalog\CatalogDeregistratio
     )
 );
 
-list($wm, $err) = $client->Catalog->deregister($catalogDeregistration);
+list($wm, $err) = $consul->Catalog->deregister($catalogDeregistration);
 if (null !== $err)
     die($err);
 
@@ -61,7 +61,7 @@ var_dump($wm);
 ### List Datacenters
 
 ```php
-list ($datacenters, $err) = $client->Catalog->datacenters();
+list ($datacenters, $err) = $consul->Catalog->datacenters();
 if (null !== $err)
     die($err);
 
@@ -71,7 +71,7 @@ var_dump($datacenters);
 ### List Nodes
 
 ```php
-list($nodes, $qm, $err) = $client->Catalog->nodes();
+list($nodes, $qm, $err) = $consul->Catalog->nodes();
 if (null !== $err)
     die($err);
 
@@ -81,7 +81,7 @@ var_dump($nodes, $qm);
 ### List Services
 
 ```php
-list($services, $qm, $err) = $client->Catalog->services();
+list($services, $qm, $err) = $consul->Catalog->services();
 if (null !== $err)
     die($err);
 
@@ -91,7 +91,7 @@ var_dump($services, $qm);
 ### Get Specific Service
 
 ```php
-list($service, $qm, $err) = $client->Catalog->service('servicename');
+list($service, $qm, $err) = $consul->Catalog->service('servicename');
 if (null !== $err)
     die($err);
 
@@ -101,7 +101,7 @@ var_dump($service, $qm);
 ### Get Specific Node
 
 ```php
-list($node, $qm, $err) = $client->Catalog->node('nodename');
+list($node, $qm, $err) = $consul->Catalog->node('nodename');
 if (null !== $err)
     die($err);
 

docs/COORDINATE.md

@@ -3,18 +3,18 @@
 All interactions with the [`v1/coordinate`](https://www.consul.io/docs/agent/http/coordinate.html) endpoint are done
 via the [CoordinateClient](../src/Coordinate/CoordinateClient.php) class.
 
-If you have constructed a [Client](../src/Client.php) object, this is done as so:
+If you have constructed a [Consul](../src/Consul.php) object, this is done as so:
 
 ```php
-$coordinate = $client->Coordinate;
+$coordinate = $consul->Coordinate;
 ```
 
 ## Actions
 
 ### Get Datacenter Map
 
 ```php
-list($datacenters, $err) = $client->Coordinate->datacenters();
+list($datacenters, $err) = $consul->Coordinate->datacenters();
 if (null !== $err)
     die($err);
 
@@ -24,7 +24,7 @@ var_dump($datacenters);
 ### Get Nodes List
 
 ```php
-list($nodes, $qm, $err) = $client->Coordinate->nodes();
+list($nodes, $qm, $err) = $consul->Coordinate->nodes();
 if (null !== $err)
     die($err);
 

docs/EVENT.md

@@ -3,10 +3,10 @@
 All interactions with the [`v1/event`](https://www.consul.io/docs/agent/http/event.html) endpoint
 are done via the [EventClient](../src/Event/EventClient.php) class.
 
-If you have constructed a [Client](../src/Client.php) object, this is done as so:
+If you have constructed a [Consul](../src/Consul.php) object, this is done as so:
 
 ```php
-$event = $client->Event;
+$event = $consul->Event;
 ```
 
 ## Actions
@@ -26,7 +26,7 @@ $userEvent = new \DCarbone\PHPConsulAPI\Event\UserEvent(
     )
 );
 
-list($event, $wm, $err) = $client->Event->fire($userEvent);
+list($event, $wm, $err) = $consul->Event->fire($userEvent);
 if (null !== $err)
     die($err);
 
@@ -36,7 +36,7 @@ var_dump($event, $wm);
 ### List Events
 
 ```php
-list($userEvents, $qm, $err) = $client->Event->eventList();
+list($userEvents, $qm, $err) = $consul->Event->eventList();
 if (null !== $err)
     die($err);
 

docs/HEALTH.md

@@ -3,18 +3,18 @@
 ALl interactions with the [`v1/health`](https://www.consul.io/docs/agent/http/health.html) endpoint are done
 via the [HealthClient](../src/Health/HealthClient.php) class.
 
-If you have constructed a [Client](../src/Client.php) object, this is done as so:
+If you have constructed a [Consul](../src/Consul.php) object, this is done as so:
 
 ```php
-$health = $client->Health;
+$health = $consul->Health;
 ```
 
 ## Actions
 
 ### Get Node Health
 
 ```php
-list($healthCheck, $qm, $err) = $client->Health->node('nodename');
+list($healthCheck, $qm, $err) = $consul->Health->node('nodename');
 if (null !== $err)
     die($err);
 
@@ -24,7 +24,7 @@ var_dump($healthCheck, $qm);
 ### Get Service Checks
 
 ```php
-list($checks, $qm, $err) = $client->Health->checks('service name');
+list($checks, $qm, $err) = $consul->Health->checks('service name');
 if (null !== $err)
     die($err);
 
@@ -34,7 +34,7 @@ var_dump($checks, $qm);
 ### Get Service Health
 
 ```php
-list($services, $qm, $err) = $client->Health->service('service name');
+list($services, $qm, $err) = $consul->Health->service('service name');
 if (null !== $err)
     die($err);
 
@@ -44,7 +44,7 @@ var_dump($services, $qm);
 ### Get Checks in State
 
 ```php
-list($checks, $qm, $err) = $client->health->state('state');
+list($checks, $qm, $err) = $consul->health->state('state');
 if (null !== $err)
     die($err);