issue arangodb#176: bug; Invalid bind parameter value on "file" value

Jan Steemann · Jan Steemann · commit 91da0ce82335 · 2015-01-13T17:55:23.000+01:00
diff --git a/lib/triagens/ArangoDb/ValueValidator.php b/lib/triagens/ArangoDb/ValueValidator.php
@@ -33,6 +33,11 @@ class ValueValidator
      */
     public static function validate($value)
     {
+        if (is_string($value) || is_int($value) || is_double($value) || is_bool($value) || is_null($value)) {
+            // type is allowed
+            return;
+        }
+
         if (is_array($value)) {
             // must check all elements contained
             foreach ($value as $subValue) {
@@ -41,10 +46,6 @@ public static function validate($value)
 
             return;
         }
-        else if (! is_object($value) && ! is_resource($value) && ! is_callable($value)) {
-            // type is allowed
-            return;
-        }
 
         // type is invalid
         throw new ClientException('Invalid bind parameter value');
diff --git a/tests/StatementTest.php b/tests/StatementTest.php
@@ -242,6 +242,55 @@ public function testStatementWithFullCount()
         $this->assertEquals(3, $cursor->getFullCount(), "The fullCount should be 3");
     }
 
+
+    public function testBindReservedValue()
+    {
+        $connection = $this->connection;
+        $collection = $this->collection;
+
+        $documentHandler = new DocumentHandler($connection);
+
+        $document       = new Document();
+        $document->file = 'testFooBar';
+        $documentHandler->add($collection->getId(), $document);
+
+        $statement = new Statement($connection, array(
+                                                     "query"     => 'FOR a IN `ArangoDB_PHP_TestSuite_TestCollection_01` FILTER a.file == @file RETURN a.file',
+                                                     "bindVars"  => array("file" => "testFooBar"),
+                                                     "_sanitize" => true
+                                                ));
+
+        $cursor = $statement->execute();
+
+        $rows = $cursor->getAll();
+        $this->assertEquals("testFooBar", $rows[0]);
+    }
+
+
+    public function testBindReservedName()
+    {
+        $connection = $this->connection;
+        $collection = $this->collection;
+
+        $documentHandler = new DocumentHandler($connection);
+
+        $document       = new Document();
+        $document->test = 'file';
+        $documentHandler->add($collection->getId(), $document);
+
+        $statement = new Statement($connection, array(
+                                                     "query"     => 'FOR a IN `ArangoDB_PHP_TestSuite_TestCollection_01` FILTER a.test == @test RETURN a.test',
+                                                     "bindVars"  => array("test" => "file"),
+                                                     "_sanitize" => true
+                                                ));
+
+        $cursor = $statement->execute();
+
+        $rows = $cursor->getAll();
+        $this->assertEquals("file", $rows[0]);
+    }
+
+
     public function tearDown()
     {
         try {
