Merge branch 'haanga-with-composer' into 'master'

Haanga with composer

See merge request !11

classes/Convert.php

@@ -2,114 +2,113 @@
 
 namespace uib\ub\loadspeakr;
 
-//Based (but corrected) from http://www.php.net/manual/en/language.types.object.php#102735
-
 use Exception;
 use stdClass;
 
-final class Convert {
-  # Convert a stdClass to an Array.
-  static public function object_to_array(stdClass $Class){
-  	# Typecast to (array) automatically converts stdClass -> array.
-  	$newClass = array();
-  	
-  	# Iterate through the former properties looking for any stdClass properties.
-  	# Recursively apply (array).
-  	foreach($Class as $key => $value){
-  	  if(is_object($value)&&get_class($value)==='stdClass'){
-  	  	$newClass[$key] = self::object_to_array($value);
-  	  }else{
-  	  	$newClass[$key] = $value;
-  	  }
-  	}
-  	return $newClass;
-  }
-  
-  # Convert an Array to stdClass.
-  static public function array_to_object(array $array){
-  	# Iterate through our array looking for array values.
-  	# If found recurvisely call itself.
-  	$obj = new stdClass();
-  	foreach($array as $key => $value){
-  	  if(is_array($value)){
-  	  	$obj->$key = self::array_to_object($value);
-  	  }else{
-  	  	$obj->$key = $value;
-  	  }
-  	}
-  	
-  	# Typecast to (object) will automatically convert array -> stdClass
-  	return $obj;
-  }
-  
-  
-  //Taken from http://www.php.net/manual/en/ref.array.php#81081
-  
-  static public function array_copy (array $aSource) {
-  	// check if input is really an array
-  	if (!is_array($aSource)) {
-  	  throw new Exception("Input is not an Array");
-  	}
-  	
-  	// initialize return array
-  	$aRetAr = array();
-  	
-  	// get array keys
-  	$aKeys = array_keys($aSource);
-  	// get array values
-  	$aVals = array_values($aSource);
-  	
-  	// loop through array and assign keys+values to new return array
-  	for ($x=0;$x<count($aKeys);$x++) {
-  	  // clone if object
-  	  if (is_object($aVals[$x])) {
-  	  	$aRetAr[$aKeys[$x]]=clone $aVals[$x];
-  	  	// recursively add array
-  	  } elseif (is_array($aVals[$x])) {
-  	  	$aRetAr[$aKeys[$x]]=self::array_copy ($aVals[$x]);
-  	  	// assign just a plain scalar value
-  	  } else {
-  	  	$aRetAr[$aKeys[$x]]=$aVals[$x];
-  	  }
-  	}
-  	
-  	return $aRetAr;
-  }
-  
-  
-  static public function getPaths ($r, $path) {
-    global $lodspk;
-    global $conf;
-    $arr = array();
-    foreach($r as $k => $v){
-      if($k == "params" ){
-        continue;
-      }
-      if($k == "0"){//if query
-        return NULL;
-      }
-      $next = self::getPaths($r->$k, $path."endpoint.".$k."/", $arr);
-      if($next == NULL){
-         $aux = $path.$k;
-         $root = array();
-         $pointer = &$root;
-         $aux2 = explode("/", $aux);
-         $key = str_ireplace("endpoint.", "", array_shift($aux2));
-         foreach($aux2 as $w){
-           $x = str_ireplace("endpoint.", "", $w);
-           $pointer[$x] = array();
-           $pointer = &$pointer[$x];
-         }
-         $pointer = $lodspk['baseUrl'].'components/'.$conf[$lodspk['module']]['prefix']."/".$lodspk['componentName']."/queries/".$aux.".query"; // TSL : removed hardcoded /lodspeakr
-         if(isset($lodspk['source'][$key])){
-          $lodspk['queries'][$key] = array_merge($lodspk['source'][$key], $root);
-         }else{
-           $lodspk['queries'][$key] = $root;
-         }
-      }
+final class Convert
+{
+    # Convert a stdClass to an Array.
+    static public function object_to_array(stdClass $Class)
+    {
+        # Typecast to (array) automatically converts stdClass -> array.
+        $newClass = array();
+
+        # Iterate through the former properties looking for any stdClass properties.
+        # Recursively apply (array).
+        foreach ($Class as $key => $value) {
+            if (is_object($value) && get_class($value) === 'stdClass') {
+                $newClass[$key] = self::object_to_array($value);
+            } else {
+                $newClass[$key] = $value;
+            }
+        }
+        return $newClass;
     }
-    return 1;
-  }
 
-}
+    # Convert an Array to stdClass.
+    static public function array_to_object(array $array)
+    {
+        # Iterate through our array looking for array values.
+        # If found recurvisely call itself.
+        $obj = new stdClass();
+        foreach ($array as $key => $value) {
+            if (is_array($value)) {
+                $obj->$key = self::array_to_object($value);
+            } else {
+                $obj->$key = $value;
+            }
+        }
+
+        # Typecast to (object) will automatically convert array -> stdClass
+        return $obj;
+    }
+
+    //Taken from http://www.php.net/manual/en/ref.array.php#81081
+    static public function array_copy(array $aSource)
+    {
+        // check if input is really an array
+        if (!is_array($aSource)) {
+            throw new Exception("Input is not an Array");
+        }
+
+        // initialize return array
+        $aRetAr = array();
 
+        // get array keys
+        $aKeys = array_keys($aSource);
+        // get array values
+        $aVals = array_values($aSource);
+
+        // loop through array and assign keys+values to new return array
+        for ($x = 0; $x < count($aKeys); $x++) {
+            // clone if object
+            if (is_object($aVals[$x])) {
+                $aRetAr[$aKeys[$x]] = clone $aVals[$x];
+                // recursively add array
+            } elseif (is_array($aVals[$x])) {
+                $aRetAr[$aKeys[$x]] = self::array_copy($aVals[$x]);
+                // assign just a plain scalar value
+            } else {
+                $aRetAr[$aKeys[$x]] = $aVals[$x];
+            }
+        }
+
+        return $aRetAr;
+    }
+
+    static public function getPaths($r, $path)
+    {
+        global $lodspk;
+        global $conf;
+        $arr = array();
+        foreach ($r as $k => $v) {
+            if ($k == "params") {
+                continue;
+            }
+            if ($k == "0") {//if query
+                return null;
+            }
+            $next = self::getPaths($r->$k, $path . "endpoint." . $k . "/", $arr);
+            if ($next == null) {
+                $aux = $path . $k;
+                $root = array();
+                $pointer = &$root;
+                $aux2 = explode("/", $aux);
+                $key = str_ireplace("endpoint.", "", array_shift($aux2));
+                foreach ($aux2 as $w) {
+                    $x = str_ireplace("endpoint.", "", $w);
+                    $pointer[$x] = array();
+                    $pointer = &$pointer[$x];
+                }
+                $pointer = $lodspk['baseUrl'] . 'components/' . $conf[$lodspk['module']]['prefix'] . "/" . $lodspk['componentName'] . "/queries/" . $aux . ".query"; // TSL : removed hardcoded /lodspeakr
+                if (isset($lodspk['source'][$key])) {
+                    $lodspk['queries'][$key] = array_merge($lodspk['source'][$key], $root);
+                } else {
+                    $lodspk['queries'][$key] = $root;
+                }
+            }
+        }
+        return 1;
+    }
+
+}

classes/Endpoint.php

@@ -3,119 +3,128 @@
 namespace uib\ub\loadspeakr;
 
 
-class Endpoint {
-  private $sparqlUrl;
-  private $params; 
-  
-  public function __construct($sparqlUrl, $params){
-  	$this->sparqlUrl = $sparqlUrl;
-  	$this->params = $params;
-  }
-  
-  public function query($q, $output = 'json'){
-    global $conf;
-    if (!empty($this->params['output'])){
-    $auxoutput = $this->params['output'];
-    }
-    $accept = 'application/sparql-results+json';
-    if($output != null){
-      $this->params['output'] = $output;
-    }
-    if($output == 'xml'){
-      $accept = 'application/sparql-results+xml';
-    }elseif($output == 'rdf'){
-      $accept = 'application/rdf+xml';
-    }
-    $aux = "";
-    $modified = 0;
-    $now = time();
-    $cacheFile = "";
-    if(!empty($conf['cache']['global']) && is_int($conf['cache']['global']) && $conf['cache']['global'] > 0){
-      $cacheFile = $conf['home']."cache/query".md5($this->sparqlUrl.$q);
-      if(file_exists($cacheFile)){
-        $modified = filemtime($cacheFile);
-      }
+class Endpoint
+{
+    private $sparqlUrl;
+    private $params;
+
+    public function __construct($sparqlUrl, $params)
+    {
+        $this->sparqlUrl = $sparqlUrl;
+        $this->params = $params;
     }
-    if(is_int($conf['cache']['global']) && $conf['cache']['global'] > 0 && $modified + $conf['cache']['global'] > $now){
-     if($conf['debug']){
-       $msg = "Taking data from cache ($cacheFile). Renewal in ".($modified + $conf['cache']['global'] - $now)." seconds\n";
-       Logging::log($msg);
-       echo $msg;
-     }
-       $aux = (file_get_contents($cacheFile));
-    }else{
-      $c = curl_init();
-      $context = array();
-      $context[0] = 'Connection: close';
-      $context[1] = 'Accept: '.$accept;
-      $params = $this->params;
-      $params['query'] = $q;
-      $url = $this->sparqlUrl.'?'.http_build_query($params, '', '&');
-      curl_setopt($c, CURLOPT_URL, $url);
-      curl_setopt($c, CURLOPT_HTTPHEADER, $context);
-      curl_setopt($c, CURLOPT_USERAGENT, "LODSPeaKr version ".$conf['version']);
-      curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
-      $aux = curl_exec($c); // execute the curl command 
-      if($conf['debug']){
-        if($aux == false){
-          Logging::log("Error executing SPARQL query (".$this->sparqlUrl."): ".curl_error($c), E_USER_ERROR);
-          echo("Error executing SPARQL query (".$this->sparqlUrl."): ".curl_error($c));
+
+    public function query($q, $output = 'json')
+    {
+        global $conf;
+        if (!empty($this->params['output'])) {
+            $auxoutput = $this->params['output'];
         }
-      }
-      $http_status = intval(curl_getinfo($c, CURLINFO_HTTP_CODE));
-      curl_close($c);
-      if (!empty($auxoutput)) {
-      $this->params['output'] = $auxoutput;
-      }
-      if(is_int($conf['cache']['global']) && $conf['cache']['global'] > 0 && $http_status == 200){
-        file_put_contents($cacheFile,($aux), LOCK_EX);
-        if($conf['debug']){
-          $msg = "Notice: Writing results in ".$cacheFile."\n";
-          Logging::log($msg, E_USER_NOTICE);
-          echo($msg);
+        $accept = 'application/sparql-results+json';
+        if ($output != null) {
+            $this->params['output'] = $output;
         }
-      }
-    }
-    if(preg_match("/select/i", $q)){
-      $r = json_decode($aux, true);
-      if($conf['debug']){
-        if($r == false){
-          Logging::log("Warning: Results from a SELECT sparql query couldn't get parsed", E_USER_WARNING);
-          echo("Warning: Results from a SELECT sparql query couldn't get parsed");
+        if ($output == 'xml') {
+            $accept = 'application/sparql-results+xml';
+        } elseif ($output == 'rdf') {
+            $accept = 'application/rdf+xml';
+        }
+        $aux = "";
+        $modified = 0;
+        $now = time();
+        $cacheFile = "";
+        if (!empty($conf['cache']['global']) && is_int($conf['cache']['global']) && $conf['cache']['global'] > 0) {
+            $cacheFile = $conf['home'] . "cache/query" . md5($this->sparqlUrl . $q);
+            if (file_exists($cacheFile)) {
+                $modified = filemtime($cacheFile);
+            }
+        }
+        if (is_int(
+            $conf['cache']['global']
+          ) && $conf['cache']['global'] > 0 && $modified + $conf['cache']['global'] > $now) {
+            if ($conf['debug']) {
+                $msg = "Taking data from cache ($cacheFile). Renewal in " . ($modified + $conf['cache']['global'] - $now) . " seconds\n";
+                Logging::log($msg);
+                echo $msg;
+            }
+            $aux = (file_get_contents($cacheFile));
+        } else {
+            $c = curl_init();
+            $context = array();
+            $context[0] = 'Connection: close';
+            $context[1] = 'Accept: ' . $accept;
+            $params = $this->params;
+            $params['query'] = $q;
+            $url = $this->sparqlUrl . '?' . http_build_query($params, '', '&');
+            curl_setopt($c, CURLOPT_URL, $url);
+            curl_setopt($c, CURLOPT_HTTPHEADER, $context);
+            curl_setopt($c, CURLOPT_USERAGENT, "LODSPeaKr version " . $conf['version']);
+            curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
+            $aux = curl_exec($c); // execute the curl command
+            if ($conf['debug']) {
+                if ($aux == false) {
+                    Logging::log(
+                      "Error executing SPARQL query (" . $this->sparqlUrl . "): " . curl_error($c),
+                      E_USER_ERROR
+                    );
+                    echo("Error executing SPARQL query (" . $this->sparqlUrl . "): " . curl_error($c));
+                }
+            }
+            $http_status = intval(curl_getinfo($c, CURLINFO_HTTP_CODE));
+            curl_close($c);
+            if (!empty($auxoutput)) {
+                $this->params['output'] = $auxoutput;
+            }
+            if (is_int($conf['cache']['global']) && $conf['cache']['global'] > 0 && $http_status == 200) {
+                file_put_contents($cacheFile, ($aux), LOCK_EX);
+                if ($conf['debug']) {
+                    $msg = "Notice: Writing results in " . $cacheFile . "\n";
+                    Logging::log($msg, E_USER_NOTICE);
+                    echo($msg);
+                }
+            }
+        }
+        if (preg_match("/select/i", $q)) {
+            $r = json_decode($aux, true);
+            if ($conf['debug']) {
+                if ($r == false) {
+                    Logging::log("Warning: Results from a SELECT sparql query couldn't get parsed", E_USER_WARNING);
+                    echo("Warning: Results from a SELECT sparql query couldn't get parsed");
+                }
+            }
+            return $r;
+        }
+
+
+        if (preg_match("/describe/i", $q)) {
+            return $aux;
+        }
+        if (preg_match("/construct/i", $q)) {
+            return $aux;
+        }
+        if (preg_match("/ask/i", $q)) {
+            $r = json_decode($aux, true);
+            return $r;
         }
-      }
-      return $r;
-    }  
-    
-    
-    if(preg_match("/describe/i", $q)){
-      return $aux;
     }
-    if(preg_match("/construct/i", $q)){
-      return $aux;
+
+    public function queryPost($q)
+    {
+        $params = $this->params;
+        $params['query'] = $q;
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $this->sparqlUrl);
+        curl_setopt($ch, CURLOPT_POST, count($params));
+        curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($params));
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        //execute post
+        $result = curl_exec($ch);
+        return $result;
     }
-    if(preg_match("/ask/i", $q)){
-      $r = json_decode($aux, true);
-      return $r;
+
+    public function getSparqlURL()
+    {
+        return $this->sparqlUrl;
     }
-  }
-  
-  public function queryPost($q){
-  	$params =  $this->params;
-  	$params['query'] = $q;
-  	$ch = curl_init();
-  	curl_setopt($ch,CURLOPT_URL,$this->sparqlUrl);
-  	curl_setopt($ch,CURLOPT_POST,count($params));
-  	curl_setopt($ch,CURLOPT_POSTFIELDS,http_build_query($params));
-  	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-  	//execute post
-  	$result = curl_exec($ch);
-  	return $result;
-  }
-  
-  public function getSparqlURL(){
-  	return $this->sparqlUrl;
-  }
-  
-}
 
+}

classes/HTTPStatus.php

@@ -4,61 +4,67 @@ namespace uib\ub\loadspeakr;
 
 use stdClass;
 
-class HTTPStatus {
-  
-  public static function send303($uri, $ext){
-  	header("HTTP/1.0 303 See Other");
-  	header("Location: ".$uri);
-  	header("Content-type: ".$ext);
-  	echo HTTPStatus::_getContent("303", $uri);
-  	exit(0);
-  }
+class HTTPStatus
+{
+    public static function send303($uri, $ext)
+    {
+        header("HTTP/1.0 303 See Other");
+        header("Location: " . $uri);
+        header("Content-type: " . $ext);
+        echo HTTPStatus::_getContent("303", $uri);
+        exit(0);
+    }
+
+    public static function send401($uri)
+    {
+        header("HTTP/1.0 401 Forbidden");
+        echo HTTPStatus::_getContent("401", $uri);
+        exit(0);
+    }
+
+    public static function send404($uri)
+    {
+        header("HTTP/1.0 404 Not Found");
+        $alt = "LODSPeaKr couldn't find the resource " . $uri;
+        echo HTTPStatus::_getContent("404", $alt);
+        exit(0);
+    }
+
+    public static function send406($uri)
+    {
+        header("HTTP/1.0 406 Not Acceptable");
+        $alt = "LODSPeaKr can't return content acceptable according to the Accept headers sent in the request for " . $uri;
+        echo HTTPStatus::_getContent("406", $alt);
+        exit(0);
+    }
+
+    public static function send500($uri)
+    {
+        header("HTTP/1.0 500 Internal Server Error");
+        $alt = "There was an internal error when processing " . $uri;
+        echo HTTPStatus::_getContent("500", $alt);
+        exit(0);
+    }
+
+    private static function _getContent($n, $alt)
+    {
+        global $conf;
+        global $lodspk;
+        $lodspk['root'] = $conf['root'];
+        $lodspk['home'] = $conf['basedir'];
+        $lodspk['baseUrl'] = $conf['basedir'];
+        $lodspk['ns'] = $conf['ns'];
+        $lodspk['this']['value'] = $uri;
+        $lodspk['this']['curie'] = Utils::uri2curie($uri);
+        $lodspk['this']['local'] = $localUri;
+
+        $file = $conf['httpStatus']['directory'] . "/" . $n . ".template";
 
-  public static function send401($uri){
-  	header("HTTP/1.0 401 Forbidden");
-  	echo HTTPStatus::_getContent("401", $uri);
-  	exit(0);
-  }
-  
-  public static function send404($uri){
-    header("HTTP/1.0 404 Not Found");
-    $alt = "LODSPeaKr couldn't find the resource ".$uri;
-  	echo HTTPStatus::_getContent("404", $alt);
-  	exit(0);
-  }
-  
-  public static function send406($uri){
-    header("HTTP/1.0 406 Not Acceptable");
-    $alt = "LODSPeaKr can't return content acceptable according to the Accept headers sent in the request for ".$uri;
-  	echo HTTPStatus::_getContent("406", $alt);
-  	exit(0);
-  }
-  
-  public static function send500($uri){
-  	header("HTTP/1.0 500 Internal Server Error");
-  	$alt = "There was an internal error when processing ".$uri;
-  	echo HTTPStatus::_getContent("500", $alt);
-  	exit(0);
-  }
-  
-  private static function _getContent($n, $alt){
-    global $conf;
-    global $lodspk;
-    $lodspk['root'] = $conf['root'];
-  	$lodspk['home'] = $conf['basedir'];
-  	$lodspk['baseUrl'] = $conf['basedir'];
-  	$lodspk['ns'] = $conf['ns'];
-  	$lodspk['this']['value'] = $uri;
-  	$lodspk['this']['curie'] = Utils::uri2curie($uri);
-  	$lodspk['this']['local'] = $localUri;
-  	
-    $file = $conf['httpStatus']['directory']."/".$n.".template";
-   
-    if(file_exists($conf['home'].$file)){
-      require_once("Utils.php");
-      Utils::showView($lodspk, new stdClass(), $file);
-    }else{
-      return $alt."\n\n";
+        if (file_exists($conf['home'] . $file)) {
+            require_once("Utils.php");
+            Utils::showView($lodspk, new stdClass(), $file);
+        } else {
+            return $alt . "\n\n";
+        }
     }
-  }
 }

classes/Logging.php

@@ -2,44 +2,44 @@
 
 namespace uib\ub\loadspeakr;
 
-
-class Logging {
-  
-  public static function init(){
-    $logs = array();
-    if ($handle = opendir('cache/')) {
-      while (false !== ($entry = readdir($handle))) {
-        if (strpos($entry, ".log") == strlen($entry)-4) {
-            $logs[] = $entry;
+class Logging
+{
+    public static function init()
+    {
+        $logs = array();
+        if ($handle = opendir('cache/')) {
+            while (false !== ($entry = readdir($handle))) {
+                if (strpos($entry, ".log") == strlen($entry) - 4) {
+                    $logs[] = $entry;
+                }
+            }
+            closedir($handle);
         }
-      }
-    closedir($handle);
-    }
-    sort($logs);
-    $alogs = "";
-    $list = array();
-    foreach($logs as $v){
-      $newtokens = array( ".", "/");
-      $oldtokens = array("___DOT___", "___SLASH___");
-      $label = str_replace($oldtokens, $newtokens, $v);
-      $x = explode("_", $label);
-      $y = array_shift($x);
-      array_shift($x);
-      if(!isset($list[$y])){
-        $list[$y] = array();
-      }
-      $list[$y][] = array("name" => implode("_", $x), "url" => $v);
-      //$alogs .= "<p><a href='#lodspeakr/cache/$v'>$label</a></p>";
-    }
-    krsort($list);
-    foreach($list as $k => $v){
-      $alogs .= "<li>".date("H:i:s", $k)."<ul>\n";
-      foreach($v as $w){
-        $alogs .= " <li><a href='#cache/".$w['url']."'>".$w['name']."</a></li>\n"; // TSL : removed hardcoded "lodspeakr" after #
-      }
-      $alogs .="</ul></li>";
-    }
-    echo "
+        sort($logs);
+        $alogs = "";
+        $list = array();
+        foreach ($logs as $v) {
+            $newtokens = array(".", "/");
+            $oldtokens = array("___DOT___", "___SLASH___");
+            $label = str_replace($oldtokens, $newtokens, $v);
+            $x = explode("_", $label);
+            $y = array_shift($x);
+            array_shift($x);
+            if (!isset($list[$y])) {
+                $list[$y] = array();
+            }
+            $list[$y][] = array("name" => implode("_", $x), "url" => $v);
+            //$alogs .= "<p><a href='#lodspeakr/cache/$v'>$label</a></p>";
+        }
+        krsort($list);
+        foreach ($list as $k => $v) {
+            $alogs .= "<li>" . date("H:i:s", $k) . "<ul>\n";
+            foreach ($v as $w) {
+                $alogs .= " <li><a href='#cache/" . $w['url'] . "'>" . $w['name'] . "</a></li>\n"; // TSL : removed hardcoded "lodspeakr" after #
+            }
+            $alogs .= "</ul></li>";
+        }
+        echo "
 <!DOCTYPE html>
 <html>
  <head>
@@ -122,27 +122,30 @@ class Logging {
    </script>
   </body>
 </html>";
-  }
-  public static function log($msg){
-    global $conf;
-    $log = array('timestamp' => time());
-    $log['message'] = $msg;
-    if($conf['logfile'] != null){
-      fwrite($conf['logfile'], ", ".json_encode($log));
     }
-  }
 
-  public static function createLogFile($url){
-    $oldtokens = array( ".", "/");
-    $newtokens = array("___DOT___", "___SLASH___");
-    $filename = str_replace($oldtokens, $newtokens, $url);
-    $logfile = fopen("cache/".time()."_".rand()."_".$filename.".log", "w");
-    if($logfile === FALSE){
-      die("Can't create log file. Check permissions in <tt>cache/</tt> directory.");
+    public static function log($msg)
+    {
+        global $conf;
+        $log = array('timestamp' => time());
+        $log['message'] = $msg;
+        if ($conf['logfile'] != null) {
+            fwrite($conf['logfile'], ", " . json_encode($log));
+        }
     }
-    $initialmsg = array('timestamp' => time(), 'message' => "Starting log for ".$url);
-    fwrite($logfile, "{ \"logs\": [".json_encode($initialmsg));
 
-    return $logfile;
-  }
+    public static function createLogFile($url)
+    {
+        $oldtokens = array(".", "/");
+        $newtokens = array("___DOT___", "___SLASH___");
+        $filename = str_replace($oldtokens, $newtokens, $url);
+        $logfile = fopen("cache/" . time() . "_" . rand() . "_" . $filename . ".log", "w");
+        if ($logfile === false) {
+            die("Can't create log file. Check permissions in <tt>cache/</tt> directory.");
+        }
+        $initialmsg = array('timestamp' => time(), 'message' => "Starting log for " . $url);
+        fwrite($logfile, "{ \"logs\": [" . json_encode($initialmsg));
+
+        return $logfile;
+    }
 }

classes/MetaDb.php

@@ -2,51 +2,55 @@
 
 namespace uib\ub\loadspeakr;
 
-
 use Exception;
 use PDO;
 use PDOException;
 
-class MetaDb {
-  private $dbLocation;
-  
-  public function __construct($location){
-  	$this->dbLocation = $location;
-  }
-  
-   public function query($q){
+class MetaDb
+{
+    private $dbLocation;
+
+    public function __construct($location)
+    {
+        $this->dbLocation = $location;
+    }
+
+    public function query($q)
+    {
         global $conf;
-        try{
-	        $db = new PDO('sqlite:'.$this->dbLocation);
-	        $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
-
-	        $results = array();
-	        foreach($db->query($q) as $entry) {
-	        	array_push($results, $entry);
-	        }
-			$db = NULL;
-		}catch(PDOException $e){
-				print 'Exception query : '.$e->getMessage()."\nDatabase used:".$this->dbLocation."\nPlease check the webserver has write permissions to the file AND the directory, as well as you have installed the driver for PHP and SQLite";
-				exit(10);
-		}
+        try {
+            $db = new PDO('sqlite:' . $this->dbLocation);
+            $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
+
+            $results = array();
+            foreach ($db->query($q) as $entry) {
+                array_push($results, $entry);
+            }
+            $db = null;
+        } catch (PDOException $e) {
+            print 'Exception query : ' . $e->getMessage(
+              ) . "\nDatabase used:" . $this->dbLocation . "\nPlease check the webserver has write permissions to the file AND the directory, as well as you have installed the driver for PHP and SQLite";
+            exit(10);
+        }
         return $results;
-  }
-  
-   public function write($q){
+    }
+
+    public function write($q)
+    {
         global $conf;
-        try{
-	    	$db = new PDO('sqlite:'.$this->dbLocation);
-	    	$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-	    	$results = $db->exec($q);
-			$db = NULL;
-		}catch(Exception $e){
-				echo "Can't write in SQLite database. Please check you have granted write permissions to <tt>meta/</tt> and <tt>meta/db.sqlite</tt>.<br/>Also you can check a list of <a href='https://github.com/alangrafu/lodspeakr/wiki/CommonErrors'>common errors</a> and how to <a href='https://github.com/alangrafu/lodspeakr/wiki/Wipe-out-the-database'>wipe out the database</a>'";
-				if($conf['debug']){
-				  Logging::log('Exception exec: '.$e->getMessage(), E_USER_ERROR);
-				}
-				exit(1);
-		}
+        try {
+            $db = new PDO('sqlite:' . $this->dbLocation);
+            $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+            $results = $db->exec($q);
+            $db = null;
+        } catch (Exception $e) {
+            echo "Can't write in SQLite database. Please check you have granted write permissions to <tt>meta/</tt> and <tt>meta/db.sqlite</tt>.<br/>Also you can check a list of <a href='https://github.com/alangrafu/lodspeakr/wiki/CommonErrors'>common errors</a> and how to <a href='https://github.com/alangrafu/lodspeakr/wiki/Wipe-out-the-database'>wipe out the database</a>'";
+            if ($conf['debug']) {
+                Logging::log('Exception exec: ' . $e->getMessage(), E_USER_ERROR);
+            }
+            exit(1);
+        }
         return $results;
-  }
-  
+    }
+
 }

classes/Queries.php

@@ -5,9 +5,11 @@ namespace uib\ub\loadspeakr;
 
 use Exception;
 
-class Queries {
-  public static function uriExist($uri, $e){
-  	$q = "ASK WHERE{
+class Queries
+{
+    public static function uriExist($uri, $e)
+    {
+        $q = "ASK WHERE{
   	{
   	GRAPH ?g{
     	{<$uri> ?p1 []}
@@ -24,15 +26,16 @@ class Queries {
     	{[] ?p2 <$uri>}
     	}
     }";
-  	$r = $e->query($q); 
-  	if($r['boolean'] && strtolower($r['boolean']) !== false){
-  	  return true;
-  	}
-  	return false;
-  }
-  
-  public static function getClass($uri, $e){
-  	$q = "SELECT DISTINCT ?class ?inst WHERE{
+        $r = $e->query($q);
+        if ($r['boolean'] && strtolower($r['boolean']) !== false) {
+            return true;
+        }
+        return false;
+    }
+
+    public static function getClass($uri, $e)
+    {
+        $q = "SELECT DISTINCT ?class ?inst WHERE{
   	 {
   	  GRAPH ?g{
   	  {
@@ -49,69 +52,67 @@ class Queries {
   	  }
   	 }
   	}";
-  	try{
-  	  $r = $e->query($q);
-  	}catch (Exception $ex){
-  	  echo $ex->getMessage();
-  	}
-  	$result = array();
-  	/*if(sizeof($r['results']['bindings']) == 0){
-  	  return 'http://www.w3.org/2000/01/rdf-schema#Resource'; //default value if no type is present
-  	}*/
-  	//$result[] = 'http://www.w3.org/2000/01/rdf-schema#Resource'; //All resources are rdf:type rdfs:Resource
-  	foreach($r['results']['bindings'] as $v){
-  	  $result[]= $v['class']['value'];
-  	}
-  	return $result;
-  }
-  
-  
-  public static function getMetadata($uri, $format, $e){
-		global $conf;
-		$q = <<<QUERY
+        try {
+            $r = $e->query($q);
+        } catch (Exception $ex) {
+            echo $ex->getMessage();
+        }
+        $result = array();
+        /*if(sizeof($r['results']['bindings']) == 0){
+          return 'http://www.w3.org/2000/01/rdf-schema#Resource'; //default value if no type is present
+        }*/
+        //$result[] = 'http://www.w3.org/2000/01/rdf-schema#Resource'; //All resources are rdf:type rdfs:Resource
+        foreach ($r['results']['bindings'] as $v) {
+            $result[] = $v['class']['value'];
+        }
+        return $result;
+    }
+
+    public static function getMetadata($uri, $format, $e)
+    {
+        global $conf;
+        $q = <<<QUERY
 		SELECT uri, doc, format FROM document WHERE 
 			(uri = "$uri" AND format = "$format") OR doc = "$uri"
 		LIMIT 1
 QUERY;
-	   $r = $e->query($q);
-		if(sizeof($r) > 0){
-		 $u = $r[0]['uri'];
-		 $p = $r[0]['doc'];
-		 $f = $r[0]['format'];
-		  return array($u, $p, $f);
-		}else{
-		  return NULL;
-		}
-	}
-  
+        $r = $e->query($q);
+        if (sizeof($r) > 0) {
+            $u = $r[0]['uri'];
+            $p = $r[0]['doc'];
+            $f = $r[0]['format'];
+            return array($u, $p, $f);
+        } else {
+            return null;
+        }
+    }
+
+    public static function createPage($uri, $localUri, $contentType, $e)
+    {
+        global $conf;
 
-	public static function createPage($uri, $localUri, $contentType, $e){
-	 global $conf;
-	 
-		$ext = 'html';
-		$inserts = "";
-		foreach($conf['http_accept'] as $extension => $f){
-		  $page = $localUri.$conf['extension_connector'].$extension;
-			foreach($f as $v){
-			  if($contentType == $v){
-				$returnPage = $localUri.$conf['extension_connector'].$extension;
-			  }
-			  if($inserts != ""){
-				$inserts .= "UNION ";
-			  }
-			  $inserts .= "SELECT '$uri', '$page', '$v' \n";
-			  if($v == $contentType){
-				$ext = $extension;
-			  }
-			}
-		  }
-		  $q = <<<QUERY
+        $ext = 'html';
+        $inserts = "";
+        foreach ($conf['http_accept'] as $extension => $f) {
+            $page = $localUri . $conf['extension_connector'] . $extension;
+            foreach ($f as $v) {
+                if ($contentType == $v) {
+                    $returnPage = $localUri . $conf['extension_connector'] . $extension;
+                }
+                if ($inserts != "") {
+                    $inserts .= "UNION ";
+                }
+                $inserts .= "SELECT '$uri', '$page', '$v' \n";
+                if ($v == $contentType) {
+                    $ext = $extension;
+                }
+            }
+        }
+        $q = <<<QUERY
 		  INSERT INTO document (uri, doc, format) $inserts
 QUERY;
-	$r = $e->write($q);
-	
-		return $returnPage;
-	}
-	
-}
+        $r = $e->write($q);
 
+        return $returnPage;
+    }
+}

classes/modules/abstractModule.php

 <?php
 
-abstract class AbstractModule {
-  abstract protected function match($uri);
-  abstract protected function execute($params);
+abstract class AbstractModule
+{
+    abstract protected function match($uri);
+
+    abstract protected function execute($params);
 }

classes/modules/redirectModule.php

@@ -4,34 +4,35 @@ use uib\ub\loadspeakr\MetaDb;
 
 require_once('abstractModule.php');
 
-class RedirectModule extends abstractModule {
-  //Class module
-  
-  public function match($uri){
-  	global $conf;
-  	global $localUri;
-  	global $uri;
-  	global $acceptContentType;
-  	global $endpoints;
-  	global $lodspk;
-  	
-  	require_once($conf['home'].'classes/MetaDb.php');
-  	$metaDb = new MetaDb($conf['metadata']['db']['location']);
-
-  	return true;
-  }
-  
-  public function execute($pair){
-  	global $conf;
-  	global $localUri;
-  	global $uri;
-  	global $acceptContentType;
-  	global $endpoints;
-  	global $lodspk;
-  	global $results;
-  	global $firstResults;
-
-  	echo $uri." is The uri";
-  }
-  
+class RedirectModule extends abstractModule
+{
+    public function match($uri)
+    {
+        global $conf;
+        global $localUri;
+        global $uri;
+        global $acceptContentType;
+        global $endpoints;
+        global $lodspk;
+
+        require_once($conf['home'] . 'classes/MetaDb.php');
+        $metaDb = new MetaDb($conf['metadata']['db']['location']);
+
+        return true;
+    }
+
+    public function execute($pair)
+    {
+        global $conf;
+        global $localUri;
+        global $uri;
+        global $acceptContentType;
+        global $endpoints;
+        global $lodspk;
+        global $results;
+        global $firstResults;
+
+        echo $uri . " is The uri";
+    }
+
 }

composer.json

@@ -8,7 +8,14 @@
       "email": "alvaro@graves.cl"
     }
   ],
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/ubbdst/Haanga"
+    }
+  ],
   "require": {
+    "ubbdst/haanga": "^1.0.7",
     "semsol/arc2": "^2",
     "symfony/http-foundation": "^5.3",
     "ext-pdo": "*",
@@ -30,6 +37,7 @@
     "roave/security-advisories": "dev-latest",
     "phan/phan": "4.x",
     "phpstan/phpstan": "^0.12.83",
-    "phpunit/phpunit": "^9"
+    "phpunit/phpunit": "^9",
+    "squizlabs/php_codesniffer": "3.*"
   }
 }