- Some changes for best practices

frankmayer · frankmayer · commit 41247e68677d · 2017-02-11T17:38:02.000+02:00
- corrected typos
- removed redundant escape from regex
diff --git a/lib/ArangoDBClient/Batch.php b/lib/ArangoDBClient/Batch.php
@@ -339,7 +339,7 @@ public function append($method, $request)
         }
 
         if (null === $this->_nextBatchPartId) {
-            if (is_a($this->_batchParts, 'SplFixedArray')) {
+            if (is_a($this->_batchParts, \SplFixedArray::class)) {
                 $nextNumeric = $this->_nextId;
                 $this->_nextId++;
             } else {
diff --git a/lib/ArangoDBClient/Document.php b/lib/ArangoDBClient/Document.php
@@ -636,7 +636,7 @@ public function setInternalId($id)
         }
 
 
-        if (!preg_match('/^[a-zA-Z0-9_-]{1,64}\/[a-zA-Z0-9_:\.@\-()+,=;$!*\'%]{1,254}$/', $id)) {
+        if (!preg_match('/^[a-zA-Z0-9_-]{1,64}\/[a-zA-Z0-9_:.@\-()+,=;$!*\'%]{1,254}$/', $id)) {
             throw new ClientException('Invalid format for document id');
         }
 
@@ -660,7 +660,7 @@ public function setInternalKey($key)
             throw new ClientException('Should not update the key of an existing document');
         }
 
-        if (!preg_match('/^[a-zA-Z0-9_:\.@\-()+,=;$!*\'%]{1,254}$/', $key)) {
+        if (!preg_match('/^[a-zA-Z0-9_:.@\-()+,=;$!*\'%]{1,254}$/', $key)) {
             throw new ClientException('Invalid format for document key');
         }
 
diff --git a/lib/ArangoDBClient/FoxxHandler.php b/lib/ArangoDBClient/FoxxHandler.php
@@ -24,14 +24,14 @@ class FoxxHandler extends Handler
      * @throws ClientException
      *
      * @param string $localZip   - the path to the local foxx-app zip-archive to upload/install
-     * @param string $mountPoint - the mountpoint for the app, must begin with a '/'
+     * @param string $mountPoint - the mount-point for the app, must begin with a '/'
      * @param array  $options    - for future usage
      *
      * @return array - the server response
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function installFoxxZip($localZip, $mountPoint, $options = [])
+    public function installFoxxZip($localZip, $mountPoint, array $options = [])
     {
         if (!file_exists($localZip)) {
             throw new ClientException("Foxx-Zip {$localZip} does not exist (or file is unreadable).");
@@ -68,7 +68,7 @@ public function installFoxxZip($localZip, $mountPoint, $options = [])
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function removeFoxxApp($mountPoint, $options = [])
+    public function removeFoxxApp($mountPoint, array $options = [])
     {
         try {
             $response = $this->getConnection()->put(Urls::URL_FOXX_UNINSTALL, json_encode(['mount' => $mountPoint]));
diff --git a/lib/ArangoDBClient/GraphHandler.php b/lib/ArangoDBClient/GraphHandler.php
@@ -250,7 +250,7 @@ public function properties($graph)
      * @throws Exception
      *
      * @param mixed $graph           - graph name as a string or instance of Graph
-     * @param bool  $dropCollections - if set to false the graphs collections will not be droped.
+     * @param bool  $dropCollections - if set to false the graphs collections will not be dropped.
      *
      * @return bool - always true, will throw if there is an error
      * @since 1.2

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ public function append($method, $request)`
`339`	`339`	`}`
`340`	`340`
`341`	`341`	`if (null === $this->_nextBatchPartId) {`
`342`		`- if (is_a($this->_batchParts, 'SplFixedArray')) {`
	`342`	`+ if (is_a($this->_batchParts, \SplFixedArray::class)) {`
`343`	`343`	`$nextNumeric = $this->_nextId;`
`344`	`344`	`$this->_nextId++;`
`345`	`345`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,7 @@ public function setInternalId($id)`
`636`	`636`	`}`
`637`	`637`
`638`	`638`
`639`		`- if (!preg_match('/^[a-zA-Z0-9_-]{1,64}\/[a-zA-Z0-9_:\.@\-()+,=;$!*\'%]{1,254}$/', $id)) {`
	`639`	`+ if (!preg_match('/^[a-zA-Z0-9_-]{1,64}\/[a-zA-Z0-9_:.@\-()+,=;$!*\'%]{1,254}$/', $id)) {`
`640`	`640`	`throw new ClientException('Invalid format for document id');`
`641`	`641`	`}`
`642`	`642`
`@@ -660,7 +660,7 @@ public function setInternalKey($key)`
`660`	`660`	`throw new ClientException('Should not update the key of an existing document');`
`661`	`661`	`}`
`662`	`662`
`663`		`- if (!preg_match('/^[a-zA-Z0-9_:\.@\-()+,=;$!*\'%]{1,254}$/', $key)) {`
	`663`	`+ if (!preg_match('/^[a-zA-Z0-9_:.@\-()+,=;$!*\'%]{1,254}$/', $key)) {`
`664`	`664`	`throw new ClientException('Invalid format for document key');`
`665`	`665`	`}`
`666`	`666`
Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,14 @@ class FoxxHandler extends Handler`
`24`	`24`	`* @throws ClientException`
`25`	`25`	`*`
`26`	`26`	`* @param string $localZip - the path to the local foxx-app zip-archive to upload/install`
`27`		`- * @param string $mountPoint - the mountpoint for the app, must begin with a '/'`
	`27`	`+ * @param string $mountPoint - the mount-point for the app, must begin with a '/'`
`28`	`28`	`* @param array $options - for future usage`
`29`	`29`	`*`
`30`	`30`	`* @return array - the server response`
`31`	`31`	`*`
`32`	`32`	`* @SuppressWarnings(PHPMD.UnusedFormalParameter)`
`33`	`33`	`*/`
`34`		`- public function installFoxxZip($localZip, $mountPoint, $options = [])`
	`34`	`+ public function installFoxxZip($localZip, $mountPoint, array $options = [])`
`35`	`35`	`{`
`36`	`36`	`if (!file_exists($localZip)) {`
`37`	`37`	`throw new ClientException("Foxx-Zip {$localZip} does not exist (or file is unreadable).");`
`@@ -68,7 +68,7 @@ public function installFoxxZip($localZip, $mountPoint, $options = [])`
`68`	`68`	`*`
`69`	`69`	`* @SuppressWarnings(PHPMD.UnusedFormalParameter)`
`70`	`70`	`*/`
`71`		`- public function removeFoxxApp($mountPoint, $options = [])`
	`71`	`+ public function removeFoxxApp($mountPoint, array $options = [])`
`72`	`72`	`{`
`73`	`73`	`try {`
`74`	`74`	`$response = $this->getConnection()->put(Urls::URL_FOXX_UNINSTALL, json_encode(['mount' => $mountPoint]));`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ public function properties($graph)`
`250`	`250`	`* @throws Exception`
`251`	`251`	`*`
`252`	`252`	`* @param mixed $graph - graph name as a string or instance of Graph`
`253`		`- * @param bool $dropCollections - if set to false the graphs collections will not be droped.`
	`253`	`+ * @param bool $dropCollections - if set to false the graphs collections will not be dropped.`
`254`	`254`	`*`
`255`	`255`	`* @return bool - always true, will throw if there is an error`
`256`	`256`	`* @since 1.2`