make /_api/aqlfunctions a bit more forwards-compatible

jsteemann · jsteemann · commit ccb37ded4e30 · 2018-02-16T00:27:47.000+01:00
diff --git a/lib/ArangoDBClient/AqlUserFunction.php b/lib/ArangoDBClient/AqlUserFunction.php
@@ -195,7 +195,11 @@ public function getRegisteredUserFunctions($namespace = null)
         }
         $response = $this->_connection->get($url);
 
-        return $response->getJson();
+        $data = $response->getJson();
+        if (isset($data['result'])) {
+            return $data['result'];
+        }
+        return $data;
     }
 
 
diff --git a/tests/AqlUserFunctionTest.php b/tests/AqlUserFunctionTest.php
@@ -62,7 +62,7 @@ private function filter($list)
     {
         $result = [];
         foreach ($list as $value) {
-            if (strpos($value['name'], 'phpTestFunctions') === 0) {
+            if (strpos(@$value['name'], 'phpTestFunctions') === 0) {
                 $result[] = $value;
             }
         }
@@ -93,7 +93,6 @@ public function testRegisterListAndUnRegisterAqlUserFunctionWithInitialConfig()
         );
         $list = $this->filter($userFunction->getRegisteredUserFunctions());
 
-
         static::assertCount(1, $list, 'List returned did not return expected 1 attribute (This might happen, if tests are run in parallel)');
         static::assertTrue(
             $list[0]['name'] === $name && $list[0]['code'] === $code,

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,11 @@ public function getRegisteredUserFunctions($namespace = null)`
`195`	`195`	`}`
`196`	`196`	`$response = $this->_connection->get($url);`
`197`	`197`
`198`		`- return $response->getJson();`
	`198`	`+ $data = $response->getJson();`
	`199`	`+ if (isset($data['result'])) {`
	`200`	`+ return $data['result'];`
	`201`	`+ }`
	`202`	`+ return $data;`
`199`	`203`	`}`
`200`	`204`
`201`	`205`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ private function filter($list)`
`62`	`62`	`{`
`63`	`63`	`$result = [];`
`64`	`64`	`foreach ($list as $value) {`
`65`		`- if (strpos($value['name'], 'phpTestFunctions') === 0) {`
	`65`	`+ if (strpos(@$value['name'], 'phpTestFunctions') === 0) {`
`66`	`66`	`$result[] = $value;`
`67`	`67`	`}`
`68`	`68`	`}`
`@@ -93,7 +93,6 @@ public function testRegisterListAndUnRegisterAqlUserFunctionWithInitialConfig()`
`93`	`93`	`);`
`94`	`94`	`$list = $this->filter($userFunction->getRegisteredUserFunctions());`
`95`	`95`
`96`		`-`
`97`	`96`	`static::assertCount(1, $list, 'List returned did not return expected 1 attribute (This might happen, if tests are run in parallel)');`
`98`	`97`	`static::assertTrue(`
`99`	`98`	`$list[0]['name'] === $name && $list[0]['code'] === $code,`