Remove method Client::echo() since "echo" is a reserved word

snc · Mar 16, 2019 · 9ebf39d · 9ebf39d
1 parent 44af7dd
commit 9ebf39d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/Client/Phpredis/Client2_2_8.php b/Client/Phpredis/Client2_2_8.php
@@ -1203,14 +1203,6 @@ public function role()
         return $this->call('role');
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function eval()
-    {
-        return $this->call('eval');
-    }
-
     /**
      * {@inheritdoc}
      */

diff --git a/Client/Phpredis/Client3_1_6.php b/Client/Phpredis/Client3_1_6.php
@@ -149,6 +149,14 @@ public function ping()
         return $this->call('ping');
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function echo()
+    {
+        return $this->call('echo');
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/Client/Phpredis/Client4_2_0.php b/Client/Phpredis/Client4_2_0.php
@@ -907,6 +907,14 @@ public function ping()
         return $this->call('ping');
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function echo()
+    {
+        return $this->call('echo');
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/clientbuilder/build_redis_client.php b/clientbuilder/build_redis_client.php
@@ -119,9 +119,10 @@ private function flatten($arguments, array &$list)
 
 /* @var $reflectedMethod \ReflectionMethod */
 foreach ($reflectedMethods as $reflectedMethod) {
-    if ($reflectedMethod->isFinal() || $reflectedMethod->isConstructor() || in_array($reflectedMethod->getName(), ['echo'], true)) {
+    if ($reflectedMethod->isFinal() || $reflectedMethod->isConstructor() || PHP_VERSION_ID < 70000 && in_array($reflectedMethod->getName(), ['echo', 'eval'], true)) {
         continue;
     }
+
     $method = "\n    /**\n";
     $method .= "     * {@inheritdoc}\n";
     $method .= "     */\n";