updated to newer ArangoDB version

jsteemann · jsteemann · commit 39f4476c2f99 · 2014-10-25T02:56:20.000+02:00
diff --git a/lib/triagens/ArangoDb/AdminHandler.php b/lib/triagens/ArangoDb/AdminHandler.php
@@ -142,17 +142,16 @@ public function getServerLog($options = array())
      * Flush the server's modules cache
      * The call triggers a flush of the modules cache on the server. See Modules Cache for details about this cache.
      *
-     * This will throw if the modules cache cannot be flushed
+     * This method does not exist on the server side since ArangoDB 2.3.0
      *
      * @throws Exception
      *
-     * @return array
+     * @return bool
      * @since 1.2
+     * @deprecated
      */
     public function flushServerModuleCache()
     {
-        $this->getConnection()->POST(Urls::URL_ADMIN_MODULES_FLUSH, '');
-
         return true;
     }
 
diff --git a/lib/triagens/ArangoDb/Urls.php b/lib/triagens/ArangoDb/Urls.php
@@ -185,11 +185,6 @@ abstract class Urls
      */
     const URL_ADMIN_ROUTING_RELOAD = '/_admin/routing/reload';
 
-    /**
-     * base URL part for admin modules flush
-     */
-    const URL_ADMIN_MODULES_FLUSH = '/_admin/modules/flush';
-
     /**
      * base URL part for admin statistics
      */
diff --git a/tests/AdminTest.php b/tests/AdminTest.php
@@ -138,16 +138,6 @@ public function testGetServerLog()
     }
 
 
-    /**
-     * Test if we can get the server version
-     */
-    public function testServerModuleCache()
-    {
-        $result = $this->adminHandler->flushServerModuleCache();
-        $this->assertTrue($result, 'Should be true!');
-    }
-
-
     /**
      * Test if we can get the server version
      */
diff --git a/tests/travis/setup_arangodb.sh b/tests/travis/setup_arangodb.sh
@@ -3,7 +3,7 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR
 
-VERSION=2.2.0
+VERSION=2.2.6
 NAME=ArangoDB-$VERSION
 
 if [ ! -d "$DIR/$NAME" ]; then
@@ -37,6 +37,7 @@ ${ARANGOD} \
     --javascript.app-path ${ARANGODB_DIR}/js/apps \
     --javascript.startup-directory ${ARANGODB_DIR}/js \
     --database.maximal-journal-size 1048576 \
+    --database.force-sync-properties false \
     --server.disable-authentication true &
 
 sleep 2

Original file line number	Diff line number	Diff line change
`@@ -142,17 +142,16 @@ public function getServerLog($options = array())`
`142`	`142`	`* Flush the server's modules cache`
`143`	`143`	`* The call triggers a flush of the modules cache on the server. See Modules Cache for details about this cache.`
`144`	`144`	`*`
`145`		`- * This will throw if the modules cache cannot be flushed`
	`145`	`+ * This method does not exist on the server side since ArangoDB 2.3.0`
`146`	`146`	`*`
`147`	`147`	`* @throws Exception`
`148`	`148`	`*`
`149`		`- * @return array`
	`149`	`+ * @return bool`
`150`	`150`	`* @since 1.2`
	`151`	`+ * @deprecated`
`151`	`152`	`*/`
`152`	`153`	`public function flushServerModuleCache()`
`153`	`154`	`{`
`154`		`- $this->getConnection()->POST(Urls::URL_ADMIN_MODULES_FLUSH, '');`
`155`		`-`
`156`	`155`	`return true;`
`157`	`156`	`}`
`158`	`157`