updating to use guzzle 7, adding TokenFile support, and attempting to…

… parse Token and TokenFile from env
mdio · Nov 16, 2020 · c6c3adf · c6c3adf
1 parent 4be4ddc
commit c6c3adf
Show file tree

Hide file tree

Showing 88 changed files with 353 additions and 205 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     "php": "^7.1",
     "ext-json": "*",
     "dcarbone/gotime": "0.3.*",
-    "guzzlehttp/guzzle": "~6",
+    "guzzlehttp/guzzle": "~7",
     "guzzlehttp/psr7": "~1"
   },
   "autoload": {

diff --git a/src/ACL/ACLClient.php b/src/ACL/ACLClient.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\ACL;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/ACL/ACLEntry.php b/src/ACL/ACLEntry.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\ACL;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/ACL/ACLReplicationStatus.php b/src/ACL/ACLReplicationStatus.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\ACL;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/AbstractClient.php b/src/AbstractClient.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/AbstractModel.php b/src/AbstractModel.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/AbstractModels.php b/src/AbstractModels.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/Agent/AgentCheck.php b/src/Agent/AgentCheck.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/Agent/AgentCheckRegistration.php b/src/Agent/AgentCheckRegistration.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/Agent/AgentCheckUpdate.php b/src/Agent/AgentCheckUpdate.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/Agent/AgentClient.php b/src/Agent/AgentClient.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/Agent/AgentMember.php b/src/Agent/AgentMember.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/Agent/AgentService.php b/src/Agent/AgentService.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -70,7 +70,7 @@ public function getPort(): int {
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isEnableTagOverride(): bool {
         return $this->EnableTagOverride;

diff --git a/src/Agent/AgentServiceCheck.php b/src/Agent/AgentServiceCheck.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/Agent/AgentServiceRegistration.php b/src/Agent/AgentServiceRegistration.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -132,14 +132,14 @@ public function setAddress(string $address): AgentServiceRegistration {
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isEnableTagOverride(): bool {
         return $this->EnableTagOverride;
     }
 
     /**
-     * @param boolean $enableTagOverride
+     * @param bool $enableTagOverride
      * @return \DCarbone\PHPConsulAPI\Agent\AgentServiceRegistration
      */
     public function setEnableTagOverride(bool $enableTagOverride): AgentServiceRegistration {

diff --git a/src/Agent/GaugeValue.php b/src/Agent/GaugeValue.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/Agent/MemberOpts.php b/src/Agent/MemberOpts.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/Agent/MetricsInfo.php b/src/Agent/MetricsInfo.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/Agent/PointValue.php b/src/Agent/PointValue.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/Agent/SampledValue.php b/src/Agent/SampledValue.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Agent;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/Catalog/CatalogClient.php b/src/Catalog/CatalogClient.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Catalog;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/Catalog/CatalogDeregistration.php b/src/Catalog/CatalogDeregistration.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Catalog;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/Catalog/CatalogNode.php b/src/Catalog/CatalogNode.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Catalog;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/Catalog/CatalogRegistration.php b/src/Catalog/CatalogRegistration.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Catalog;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/Catalog/CatalogService.php b/src/Catalog/CatalogService.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Catalog;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/src/Catalog/Node.php b/src/Catalog/Node.php
@@ -1,7 +1,7 @@
 <?php namespace DCarbone\PHPConsulAPI\Catalog;
 
 /*
-   Copyright 2016-2018 Daniel Carbone ([email protected])
+   Copyright 2016-2020 Daniel Carbone ([email protected])
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.