Renamed "SparQL" folder to "src/"

Minor changes in code

composer.json

@@ -16,7 +16,7 @@
     },
     "autoload": {
         "psr-4": {
-            "SparQL\\": "SparQL/"
+            "SparQL\\": "src/"
         }
     },
     "license": "LGPL-3.0"

SparQL/Connection.php → src/Connection.php

@@ -26,22 +26,28 @@ public function ns($short, $long)
         $this->ns[$short] = $long;
     }
 
+    /**
+     * @param null $params
+     * @return null
+     */
     public function cgiParams($params = null)
     {
         if ($params === null) {
             return $this->params;
         }
         if ($params === "") {
             $this->params = null;
-            return;
+            return null;
         }
         $this->params = $params;
+
+        return $this->params;
     }
 
     /**
      *
-     * @param type $query
-     * @param type $timeout
+     * @param string $query
+     * @param int|null $timeout
      * @return Result
      */
     public function query($query, $timeout = null)
@@ -57,12 +63,16 @@ public function query($query, $timeout = null)
         return new Result($parser->rows, $parser->fields);
     }
 
-    public function alive($timeout = 3)
+    /**
+     * @param int $timeout
+     * @return bool
+     */
+    public function alive($timeout = 3000)
     {
         try {
             $this->query("SELECT * WHERE { ?s ?p ?o } LIMIT 1", $timeout);
             return true;
-        } catch (Exception $ex) {
+        } catch (\Exception $ex) {
             return false;
         }
     }
@@ -72,7 +82,8 @@ public function alive($timeout = 3)
      * @param string $sparql
      * @param int $timeout Timeout in mileseconds
      * @return string
-     * @throws Exception
+     * @throws ConnectionException
+     * @throws \SparQL\Exception
      */
     public function dispatchQuery($sparql, $timeout = null)
     {
@@ -81,7 +92,7 @@ public function dispatchQuery($sparql, $timeout = null)
             $url .= "&" . $this->params;
         }
         if ($this->debug) {
-            print "<div class='debug'><a href='" . htmlspecialchars($url) . "'>" . htmlspecialchars($prefixes . $query) . "</a></div>\n";
+            print "<div class='debug'><a href='" . htmlspecialchars($url) . "'>" . htmlspecialchars($sparql) . "</a></div>\n";
         }
 
         $webRequest = new WebRequest($url);
@@ -125,7 +136,7 @@ public static function get($endpoint, $sparql, $ns = null)
 
         $result = $db->query($sparql);
         if (!$result) {
-            return;
+            return null;
         }
 
         return $result->fetchAll();

SparQL/ParseXml.php → src/ParseXml.php

@@ -25,6 +25,12 @@ class ParseXml
     // either you pass url atau contents.
     // Use 'url' or 'contents' for the parameter
     protected $type;
+
+    protected $result;
+    protected $part;
+    protected $part_type;
+    protected $part_datatype;
+    protected $part_lang;
 
     // public function with the default parameter value
     public function __construct($url)
@@ -50,7 +56,6 @@ protected function parse()
     {
         $this->rows = array();
         $this->fields = array();
-        $data = '';
         $this->parser = xml_parser_create("UTF-8");
         xml_set_object($this->parser, $this);
         xml_set_element_handler($this->parser, 'startXml', 'endXml');

SparQL/Result.php → src/Result.php

@@ -22,10 +22,15 @@ public function __construct($rows, $fields)
         $this->fields = $fields;
     }
 
+    /**
+     * Fetch as array
+     * 
+     * @return array|null
+     */
     public function fetchArray()
     {
         if (!isset($this->rows[$this->i])) {
-            return;
+            return null;
         }
 
         $result = array();