Forgot nullable return typehints were 7.1 only >_<

mdio · Oct 15, 2017 · 97dc3ec · 97dc3ec
1 parent 5c51c97
commit 97dc3ec
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 33 deletions.
diff --git a/src/ACL/ACLReplicationStatus.php b/src/ACL/ACLReplicationStatus.php
@@ -67,14 +67,14 @@ public function getReplicatedIndex(): int {
     /**
      * @return null|string
      */
-    public function getLastSuccess(): ?string {
+    public function getLastSuccess() {
         return $this->LastSuccess;
     }
 
     /**
      * @return null|string
      */
-    public function getLastError(): ?string {
+    public function getLastError() {
         return $this->LastError;
     }
 }
diff --git a/src/Agent/AgentClient.php b/src/Agent/AgentClient.php
@@ -61,7 +61,7 @@ public function self(): array {
     /**
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
-    public function reload(): ?Error {
+    public function reload() {
         $r = new Request('PUT', 'v1/agent/reload', $this->config);
 
         return $this->requireOK($this->doRequest($r))[2];
@@ -184,7 +184,7 @@ public function members(): array {
      * @param \DCarbone\PHPConsulAPI\Agent\AgentServiceRegistration $agentServiceRegistration
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
-    public function serviceRegister(AgentServiceRegistration $agentServiceRegistration): ?Error {
+    public function serviceRegister(AgentServiceRegistration $agentServiceRegistration) {
         $r = new Request('PUT', 'v1/agent/service/register', $this->config, $agentServiceRegistration);
 
         return $this->requireOK($this->doRequest($r))[2];
@@ -196,7 +196,7 @@ public function serviceRegister(AgentServiceRegistration $agentServiceRegistrati
      * @param string $serviceID
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
-    public function serviceDeregister(string $serviceID): ?Error {
+    public function serviceDeregister(string $serviceID) {
         $r = new Request('PUT', sprintf('v1/agent/service/deregister/%s', $serviceID), $this->config);
 
         return $this->requireOK($this->doRequest($r))[2];
@@ -209,7 +209,7 @@ public function serviceDeregister(string $serviceID): ?Error {
      * @param string $note
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
-    public function passTTL(string $checkID, string $note): ?Error {
+    public function passTTL(string $checkID, string $note) {
         return $this->updateTTL($checkID, $note, 'pass');
     }
 
@@ -220,7 +220,7 @@ public function passTTL(string $checkID, string $note): ?Error {
      * @param string $note
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
-    public function warnTTL(string $checkID, string $note): ?Error {
+    public function warnTTL(string $checkID, string $note) {
         return $this->updateTTL($checkID, $note, 'warn');
     }
 
@@ -231,7 +231,7 @@ public function warnTTL(string $checkID, string $note): ?Error {
      * @param string $note
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
-    public function failTTL(string $checkID, string $note): ?Error {
+    public function failTTL(string $checkID, string $note) {
         return $this->updateTTL($checkID, $note, 'fail');
     }
 
@@ -241,7 +241,7 @@ public function failTTL(string $checkID, string $note): ?Error {
      * @param string $status
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
-    public function updateTTL(string $checkID, string $output, string $status): ?Error {
+    public function updateTTL(string $checkID, string $output, string $status) {
         switch ($status) {
             case Consul::HealthPassing:
             case Consul::HealthWarning:
@@ -275,7 +275,7 @@ public function updateTTL(string $checkID, string $output, string $status): ?Err
      * @param \DCarbone\PHPConsulAPI\Agent\AgentCheckRegistration $agentCheckRegistration
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
-    public function checkRegister(AgentCheckRegistration $agentCheckRegistration): ?Error {
+    public function checkRegister(AgentCheckRegistration $agentCheckRegistration) {
         $r = new Request('PUT', 'v1/agent/check/register', $this->config, $agentCheckRegistration);
 
         return $this->requireOK($this->doRequest($r))[2];
@@ -285,7 +285,7 @@ public function checkRegister(AgentCheckRegistration $agentCheckRegistration): ?
      * @param string $checkID
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
-    public function checkDeregister(string $checkID): ?Error {
+    public function checkDeregister(string $checkID) {
         $r = new Request('PUT', sprintf('v1/agent/check/deregister/%s', $checkID), $this->config);
 
         return $this->requireOK($this->doRequest($r))[2];
@@ -296,7 +296,7 @@ public function checkDeregister(string $checkID): ?Error {
      * @param bool $wan
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
-    public function join(string $addr, bool $wan = false): ?Error {
+    public function join(string $addr, bool $wan = false) {
         $r = new Request('PUT', sprintf('v1/agent/join/%s', $addr), $this->config);
         if ($wan) {
             $r->Params->set('wan', '1');
@@ -311,7 +311,7 @@ public function join(string $addr, bool $wan = false): ?Error {
      * @param string $node
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
-    public function forceLeave(string $node): ?Error {
+    public function forceLeave(string $node) {
         $r = new Request('PUT', sprintf('v1/agent/force-leave/%s', $node), $this->config);
 
         list($_, $_, $err) = $this->requireOK($this->doRequest($r));
@@ -324,7 +324,7 @@ public function forceLeave(string $node): ?Error {
      * @param string $reason
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
-    public function enableServiceMaintenance(string $serviceID, string $reason = ''): ?Error {
+    public function enableServiceMaintenance(string $serviceID, string $reason = '') {
         $r = new Request('PUT', sprintf('v1/agent/service/maintenance/%s', $serviceID), $this->config);
         $r->Params->set('enable', 'true');
         $r->Params->set('reason', $reason);
@@ -338,7 +338,7 @@ public function enableServiceMaintenance(string $serviceID, string $reason = '')
      * @param string $serviceID
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
-    public function disableServiceMaintenance(string $serviceID): ?Error {
+    public function disableServiceMaintenance(string $serviceID) {
         $r = new Request('PUT', sprintf('v1/agent/service/maintenance/%s', $serviceID), $this->config);
         $r->Params->set('enable', 'false');
 
@@ -351,7 +351,7 @@ public function disableServiceMaintenance(string $serviceID): ?Error {
      * @param string $reason
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
-    public function enableNodeMaintenance(string $reason = ''): ?Error {
+    public function enableNodeMaintenance(string $reason = '') {
         $r = new Request('PUT', 'v1/agent/maintenance', $this->config);
         $r->Params->set('enable', 'true');
         $r->Params->set('reason', $reason);
@@ -364,7 +364,7 @@ public function enableNodeMaintenance(string $reason = ''): ?Error {
     /**
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
-    public function disableNodeMaintenance(): ?Error {
+    public function disableNodeMaintenance() {
         $r = new Request('PUT', 'v1/agent/maintenance', $this->config);
         $r->Params->set('enable', 'false');
 
@@ -376,7 +376,7 @@ public function disableNodeMaintenance(): ?Error {
     /**
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
-    public function leave(): ?Error {
+    public function leave() {
         $r = new Request('PUT', 'v1/agent/leave', $this->config);
 
         list($_, $_, $err) = $this->requireOK($this->doRequest($r));

diff --git a/src/Agent/AgentServiceRegistration.php b/src/Agent/AgentServiceRegistration.php
@@ -148,7 +148,7 @@ public function setEnableTagOverride(bool $EnableTagOverride): AgentServiceRegis
     /**
      * @return \DCarbone\PHPConsulAPI\Agent\AgentServiceCheck
      */
-    public function getCheck(): ?AgentServiceCheck {
+    public function getCheck() {
         return $this->Check;
     }
 

diff --git a/src/Catalog/CatalogRegistration.php b/src/Catalog/CatalogRegistration.php
@@ -102,7 +102,7 @@ public function setDatacenter(string $Datacenter): CatalogRegistration {
     /**
      * @return \DCarbone\PHPConsulAPI\Agent\AgentService
      */
-    public function getService(): ?AgentService {
+    public function getService() {
         return $this->Service;
     }
 
@@ -118,7 +118,7 @@ public function setService(AgentService $Service): CatalogRegistration {
     /**
      * @return \DCarbone\PHPConsulAPI\Agent\AgentCheck
      */
-    public function getCheck(): ?AgentCheck {
+    public function getCheck() {
         return $this->Check;
     }
 

diff --git a/src/Config.php b/src/Config.php
@@ -407,7 +407,7 @@ public function getGuzzleRequestOptions(): array {
      * @param string $param
      * @return string|null
      */
-    protected static function _tryGetEnvParam(string $param): ?string {
+    protected static function _tryGetEnvParam(string $param) {
         if (isset($_ENV[$param])) {
             return $_ENV[$param];
         }

diff --git a/src/Coordinate/CoordinateEntry.php b/src/Coordinate/CoordinateEntry.php
@@ -50,7 +50,7 @@ public function getNode(): string {
     /**
      * @return \DCarbone\PHPConsulAPI\Coordinate\Coordinate
      */
-    public function getCoord(): ?Coordinate {
+    public function getCoord() {
         return $this->Coord;
     }
 }
diff --git a/src/Health/ServiceEntry.php b/src/Health/ServiceEntry.php
@@ -70,7 +70,7 @@ public function getNode(): string {
     /**
      * @return \DCarbone\PHPConsulAPI\Agent\AgentService
      */
-    public function getService(): ?AgentService {
+    public function getService() {
         return $this->Service;
     }
 

diff --git a/src/KV/KVPair.php b/src/KV/KVPair.php
@@ -133,7 +133,7 @@ public function setFlags(int $Flags): KVPair {
     /**
      * @return null|string
      */
-    public function getValue(): ?string {
+    public function getValue() {
         return $this->Value;
     }
 

diff --git a/src/Operator/OperatorClient.php b/src/Operator/OperatorClient.php
@@ -17,7 +17,6 @@
 */
 
 use DCarbone\PHPConsulAPI\AbstractClient;
-use DCarbone\PHPConsulAPI\Error;
 use DCarbone\PHPConsulAPI\QueryOptions;
 use DCarbone\PHPConsulAPI\Request;
 use DCarbone\PHPConsulAPI\WriteOptions;
@@ -61,7 +60,7 @@ public function raftGetConfiguration(QueryOptions $options = null): array {
      * @param \DCarbone\PHPConsulAPI\WriteOptions|null $options
      * @return \DCarbone\PHPConsulAPI\Error|null error, if any
      */
-    public function raftRemovePeerByAddress(string $address, WriteOptions $options = null): ?Error {
+    public function raftRemovePeerByAddress(string $address, WriteOptions $options = null) {
         $r = new Request('DELETE', 'v1/operator/raft/peer', $this->config);
         $r->setWriteOptions($options);
         $r->Params->set('address', (string)$address);

diff --git a/src/PreparedQuery/PreparedQueryDefinition.php b/src/PreparedQuery/PreparedQueryDefinition.php
@@ -122,7 +122,7 @@ public function setToken(string $Token): PreparedQueryDefinition {
     /**
      * @return \DCarbone\PHPConsulAPI\PreparedQuery\ServiceQuery
      */
-    public function getService(): ?ServiceQuery {
+    public function getService() {
         return $this->Service;
     }
 
@@ -138,7 +138,7 @@ public function setService(ServiceQuery $Service): PreparedQueryDefinition {
     /**
      * @return \DCarbone\PHPConsulAPI\PreparedQuery\QueryDNSOptions
      */
-    public function getDNS(): ?QueryDNSOptions {
+    public function getDNS() {
         return $this->DNS;
     }
 
@@ -154,7 +154,7 @@ public function setDNS(QueryDNSOptions $DNS): PreparedQueryDefinition {
     /**
      * @return \DCarbone\PHPConsulAPI\PreparedQuery\QueryTemplate
      */
-    public function getTemplate(): ?QueryTemplate {
+    public function getTemplate() {
         return $this->Template;
     }
 

diff --git a/src/PreparedQuery/PreparedQueryExecuteResponse.php b/src/PreparedQuery/PreparedQueryExecuteResponse.php
@@ -76,7 +76,7 @@ public function getNodes(): array {
     /**
      * @return \DCarbone\PHPConsulAPI\PreparedQuery\QueryDNSOptions
      */
-    public function getDNS(): ?QueryDNSOptions {
+    public function getDNS() {
         return $this->DNS;
     }
 

diff --git a/src/PreparedQuery/ServiceQuery.php b/src/PreparedQuery/ServiceQuery.php
@@ -82,7 +82,7 @@ public function setNear(string $Near): ServiceQuery {
     /**
      * @return \DCarbone\PHPConsulAPI\PreparedQuery\QueryDatacenterOptions
      */
-    public function getFailover(): ?QueryDatacenterOptions {
+    public function getFailover() {
         return $this->Failover;
     }
 

diff --git a/src/Status/StatusClient.php b/src/Status/StatusClient.php
@@ -46,7 +46,7 @@ public function leader(): array {
     /**
      * @return array|null
      */
-    public function peers(): ?array {
+    public function peers() {
         $r = new Request('GET', 'v1/status/peers', $this->config);
 
         /** @var \Psr\Http\Message\ResponseInterface $response */