removing redundant "is_string" checks

mdio · Apr 14, 2018 · 4bae4e6 · 4bae4e6
1 parent 5f0259e
commit 4bae4e6
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 60 deletions.
diff --git a/src/Agent/AgentClient.php b/src/Agent/AgentClient.php
@@ -314,10 +314,7 @@ public function updateTTL(string $checkID, string $output, string $status) {
                 $status = Consul::HealthCritical;
                 break;
             default:
-                return new Error(sprintf(
-                    '%s is not a valid status.  Allowed: ["pass", "warn", "fail"]',
-                    is_string($status) ? $status : gettype($status)
-                ));
+                return new Error("\"{$status}\" is not a valid status.  Allowed: [\"pass\", \"warn\", \"fail\"]");
         }
 
         $r = new Request('PUT',

diff --git a/src/DateTime.php b/src/DateTime.php
@@ -35,13 +35,6 @@ public static function getDefaultFormat(): string {
      * @param string $format
      */
     public static function setDefaultFormat(string $format) {
-        if (!is_string($format)) {
-            throw new \InvalidArgumentException(sprintf(
-                'PHPConsulAPI - DateTime::setDefaultFormat expects argument 1 to be string, %s seen.',
-                gettype($format)
-            ));
-        }
-
         if (false === @date($format)) {
             throw new \InvalidArgumentException(sprintf(
                 'PHPConsulAPI - DateTime::setDefaultFormat specified invalid format "%s".  Please see http://php.net/manual/en/function.date.php.',

diff --git a/src/KV/KVClient.php b/src/KV/KVClient.php
@@ -37,16 +37,6 @@ class KVClient extends AbstractClient {
      * )
      */
     public function get(string $key, QueryOptions $options = null): array {
-        if (!is_string($key)) {
-            return [null,
-                null,
-                new Error(sprintf(
-                    '%s::get - Key expected to be string, %s seen.',
-                    get_class($this),
-                    gettype($key)
-                ))];
-        }
-
         $r = new Request('GET', sprintf('v1/kv/%s', $key), $this->config);
         $r->setQueryOptions($options);
 

diff --git a/src/Session/SessionClient.php b/src/Session/SessionClient.php
@@ -104,15 +104,6 @@ public function create(SessionEntry $sessionEntry = null, WriteOptions $options
      * )
      */
     public function destroy(string $id, WriteOptions $options = null): array {
-        if (!is_string($id)) {
-            return [null,
-                new Error(sprintf(
-                    '%s::destroy - "$id" must be string, %s seen.',
-                    get_class($this),
-                    gettype($id)
-                ))];
-        }
-
         $r = new Request('PUT', sprintf('v1/session/destroy/%s', $id), $this->config);
         $r->setWriteOptions($options);
 
@@ -134,16 +125,6 @@ public function destroy(string $id, WriteOptions $options = null): array {
      * )
      */
     public function renew(string $id, WriteOptions $options = null): array {
-        if (!is_string($id)) {
-            return [null,
-                null,
-                new Error(sprintf(
-                    '%s::renew - "$id" must be string, %s seen.',
-                    get_class($this),
-                    gettype($id)
-                ))];
-        }
-
         $r = new Request('PUT', sprintf('v1/session/renew/%s', $id), $this->config);
         $r->setWriteOptions($options);
 
@@ -191,16 +172,6 @@ public function renew(string $id, WriteOptions $options = null): array {
      * )
      */
     public function info(string $id, QueryOptions $options = null): array {
-        if (!is_string($id)) {
-            return [null,
-                null,
-                new Error(sprintf(
-                    '%s::info - "$id" must be string, %s seen.',
-                    get_class($this),
-                    gettype($id)
-                ))];
-        }
-
         $r = new Request('GET', sprintf('v1/session/info/%s', $id), $this->config);
         $r->setQueryOptions($options);
 
@@ -235,16 +206,6 @@ public function info(string $id, QueryOptions $options = null): array {
      * )
      */
     public function node(string $node, QueryOptions $options = null): array {
-        if (!is_string($node)) {
-            return [null,
-                null,
-                new Error(sprintf(
-                    '%s::node - "$node" must be string, %s seen.',
-                    get_class($this),
-                    gettype($node)
-                ))];
-        }
-
         $r = new Request('GET', sprintf('v1/session/node/%s', $node), $this->config);
         $r->setQueryOptions($options);