Merge pull request #138 from phpcr/hhvm

lsmith77 · lsmith77 · commit 9cdc05ce84d6 · 2014-09-10T13:27:56.000+02:00
make HHVM happy with ArrayObject instances used in certain array functions
diff --git a/tests/05_Reading/SessionReadMethodsTest.php b/tests/05_Reading/SessionReadMethodsTest.php
@@ -279,7 +279,7 @@ public function testGetNodeByIdentifier()
 
     public function testGetNodesByIdentifier()
     {
-        $nodes = $this->session->getNodesByIdentifier(array(
+        $nodes = (array) $this->session->getNodesByIdentifier(array(
             '842e61c0-09ab-42a9-87c0-308ccc90e6f4',
             '00000000-0000-0000-0000-000000000000',
             '13543fc6-1abf-4708-bfcc-e49511754b40',
@@ -295,7 +295,7 @@ public function testGetNodesByIdentifier()
 
     public function testGetNodesByIdentifierTraversable()
     {
-        $nodes = $this->session->getNodesByIdentifier(new \ArrayIterator(array(
+        $nodes = (array) $this->session->getNodesByIdentifier(new \ArrayIterator(array(
             '842e61c0-09ab-42a9-87c0-308ccc90e6f4',
             '00000000-0000-0000-0000-000000000000',
             '13543fc6-1abf-4708-bfcc-e49511754b40',
diff --git a/tests/19_NodeTypeManagement/NodeTypeBaseCase.php b/tests/19_NodeTypeManagement/NodeTypeBaseCase.php
@@ -62,7 +62,7 @@ abstract protected function registerBuiltinNodeType();
 
     public function testRegisterNodeTypes()
     {
-        $types = $this->registerNodeTypes(true);
+        $types = (array) $this->registerNodeTypes(true);
 
         $this->assertTypes($types);
 

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ abstract protected function registerBuiltinNodeType();`
`62`	`62`
`63`	`63`	`public function testRegisterNodeTypes()`
`64`	`64`	`{`
`65`		`- $types = $this->registerNodeTypes(true);`
	`65`	`+ $types = (array) $this->registerNodeTypes(true);`
`66`	`66`
`67`	`67`	`$this->assertTypes($types);`
`68`	`68`