enabling strict type enforcement and updating WriteOptions

mdio · Nov 18, 2020 · f112603 · f112603
1 parent 5735790
commit f112603
Show file tree

Hide file tree

Showing 87 changed files with 330 additions and 104 deletions.
diff --git a/src/ACL/ACLClient.php b/src/ACL/ACLClient.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\ACL;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\ACL;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/ACL/ACLEntry.php b/src/ACL/ACLEntry.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\ACL;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\ACL;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/ACL/ACLReplicationStatus.php b/src/ACL/ACLReplicationStatus.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\ACL;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\ACL;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/AbstractClient.php b/src/AbstractClient.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])
@@ -110,7 +112,7 @@ protected function doRequest(Request $r): array {
             // If we actually have a client defined...
             if (isset($this->config->HttpClient) && $this->config->HttpClient instanceof ClientInterface) {
                 $response =
-                    $this->config->HttpClient->send($r->toPsrRequest(), $this->config->getGuzzleRequestOptions());
+                    $this->config->HttpClient->send($r->toPsrRequest(), $this->config->getGuzzleRequestOptions($r));
             } // Otherwise, throw error to be caught below
             else {
                 throw new \RuntimeException('Unable to execute query as no HttpClient has been defined.');

diff --git a/src/AbstractModel.php b/src/AbstractModel.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/AbstractModels.php b/src/AbstractModels.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Agent/AgentCheck.php b/src/Agent/AgentCheck.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Agent;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Agent/AgentCheckRegistration.php b/src/Agent/AgentCheckRegistration.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Agent;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Agent/AgentCheckUpdate.php b/src/Agent/AgentCheckUpdate.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Agent;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Agent/AgentClient.php b/src/Agent/AgentClient.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Agent;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Agent/AgentMember.php b/src/Agent/AgentMember.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Agent;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Agent/AgentService.php b/src/Agent/AgentService.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Agent;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Agent/AgentServiceCheck.php b/src/Agent/AgentServiceCheck.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Agent;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Agent/AgentServiceRegistration.php b/src/Agent/AgentServiceRegistration.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Agent;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Agent/GaugeValue.php b/src/Agent/GaugeValue.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Agent;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Agent/MemberOpts.php b/src/Agent/MemberOpts.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Agent;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Agent/MetricsInfo.php b/src/Agent/MetricsInfo.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Agent;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Agent/PointValue.php b/src/Agent/PointValue.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Agent;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Agent/SampledValue.php b/src/Agent/SampledValue.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Agent;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Catalog/CatalogClient.php b/src/Catalog/CatalogClient.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Catalog;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Catalog;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Catalog/CatalogDeregistration.php b/src/Catalog/CatalogDeregistration.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Catalog;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Catalog;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Catalog/CatalogNode.php b/src/Catalog/CatalogNode.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Catalog;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Catalog;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Catalog/CatalogRegistration.php b/src/Catalog/CatalogRegistration.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Catalog;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Catalog;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Catalog/CatalogService.php b/src/Catalog/CatalogService.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Catalog;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Catalog;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Catalog/Node.php b/src/Catalog/Node.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Catalog;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Catalog;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Config.php b/src/Config.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Consul.php b/src/Consul.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Coordinate/Coordinate.php b/src/Coordinate/Coordinate.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Coordinate;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Coordinate;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Coordinate/CoordinateClient.php b/src/Coordinate/CoordinateClient.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Coordinate;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Coordinate;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Coordinate/CoordinateConfig.php b/src/Coordinate/CoordinateConfig.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Coordinate;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Coordinate;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Coordinate/CoordinateDatacenterMap.php b/src/Coordinate/CoordinateDatacenterMap.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Coordinate;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Coordinate;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Coordinate/CoordinateEntry.php b/src/Coordinate/CoordinateEntry.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Coordinate;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Coordinate;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Coordinate/DimensionalityConflictException.php b/src/Coordinate/DimensionalityConflictException.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Coordinate;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Coordinate;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Coordinate/funcs.php b/src/Coordinate/funcs.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Coordinate;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Coordinate;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Error.php b/src/Error.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Event/EventClient.php b/src/Event/EventClient.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Event;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Event;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Event/UserEvent.php b/src/Event/UserEvent.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Event;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Event;
 
 
 /*

diff --git a/src/HasSettableStringTags.php b/src/HasSettableStringTags.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/HasStringTags.php b/src/HasStringTags.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Health/HealthCheck.php b/src/Health/HealthCheck.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Health;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Health;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Health/HealthCheckDefinition.php b/src/Health/HealthCheckDefinition.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Health;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Health;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Health/HealthChecks.php b/src/Health/HealthChecks.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Health;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Health;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Health/HealthClient.php b/src/Health/HealthClient.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Health;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Health;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/Health/ServiceEntry.php b/src/Health/ServiceEntry.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\Health;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Health;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/HttpAuth.php b/src/HttpAuth.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/KV/KVClient.php b/src/KV/KVClient.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\KV;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\KV;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/KV/KVPair.php b/src/KV/KVPair.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\KV;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\KV;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])

diff --git a/src/KV/KVPairs.php b/src/KV/KVPairs.php
@@ -1,4 +1,6 @@
-<?php namespace DCarbone\PHPConsulAPI\KV;
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\KV;
 
 /*
    Copyright 2016-2020 Daniel Carbone ([email protected])