NatLibFi / Skosmos

model/Request.php

Braces +3 added lines, -1 removed lines

@@ -167,9 +167,11 @@
      */
     public function setVocab($vocabid)
     {
-        if (strpos($vocabid, ' ') !== false) // if there are multiple vocabularies just storing the string
+        if (strpos($vocabid, ' ') !== false) {
+          // if there are multiple vocabularies just storing the string
         {
             $this->setVocabids($vocabid);
+        }
         } else {
             $this->vocab = $this->model->getVocabulary($vocabid);
         }

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 
     public function getRequestUri()
     {
-        return $this->getServerConstant('HTTP_HOST') . $this->getServerConstant('REQUEST_URI');
+        return $this->getServerConstant('HTTP_HOST').$this->getServerConstant('REQUEST_URI');
     }
     
     /**

model/ConceptPropertyValueLiteral.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
                 return Punic\Calendar::formatDate($val, 'short');
             } catch (Exception $e) {
                 trigger_error($e->getMessage(), E_USER_WARNING);
-                return (string) $this->literal;
+                return (string)$this->literal;
             }
         }
         return $this->literal->getValue();

model/Vocabulary.php

Braces +3 added lines, -1 removed lines

@@ -76,10 +76,12 @@
      */
     public function getUriSpace()
     {
-        if ($this->urispace === null) // initialize cache
+        if ($this->urispace === null) {
+          // initialize cache
         {
             $this->urispace = $this->resource->getLiteral('void:uriSpace')->getValue();
         }
+        }
 
         return $this->urispace;
     }

Spacing +7 added lines, -7 removed lines

@@ -97,7 +97,7 @@ 
             return $lname;
         }
         // already a full URI
-        return $this->getUriSpace() . $lname;
+        return $this->getUriSpace().$lname;
     }
 
     /**
@@ -159,7 +159,7 @@ 
                 $prop = (substr($prop, 0, 5) == 'dc11:') ? str_replace('dc11:', 'dc:', $prop) : $prop;
                     $value = $val->getValue();
                     if ($value instanceof DateTime) {
-                        $val = Punic\Calendar::formatDate($value, 'full', $lang) . ' ' . Punic\Calendar::format($value, 'HH:mm:ss', $lang);
+                        $val = Punic\Calendar::formatDate($value, 'full', $lang).' '.Punic\Calendar::format($value, 'HH:mm:ss', $lang);
                     }
                     $ret[$prop][] = $val;
                 }
@@ -270,7 +270,7 @@ 
         }
         // don't know how to parse
         $rev = $parts[2];
-        $datestr = $parts[3] . ' ' . $parts[4];
+        $datestr = $parts[3].' '.$parts[4];
 
         return "$datestr (r$rev)";
     }
@@ -279,7 +279,7 @@ 
      * Counts the statistics of the vocabulary.
      * @return array of the concept/group counts
      */
-    public function getStatistics($lang = '', $array=null, $group=null)
+    public function getStatistics($lang = '', $array = null, $group = null)
     {
         $sparql = $this->getSparql();
         // find the number of concepts
@@ -595,14 +595,14 @@ 
     {
       $changelist = $this->getSparql()->queryChangeList($clang, $offset, $prop);
       $bydate = array();
-      foreach($changelist as $concept) {
+      foreach ($changelist as $concept) {
         $concept['datestring'] = Punic\Calendar::formatDate($concept['date'], 'medium', $lang);
-        $bydate[Punic\Calendar::getMonthName($concept['date'], 'wide', $lang, true) . Punic\Calendar::format($concept['date'], ' y', $lang) ][strtolower($concept['prefLabel'])] = $concept;
+        $bydate[Punic\Calendar::getMonthName($concept['date'], 'wide', $lang, true).Punic\Calendar::format($concept['date'], ' y', $lang)][strtolower($concept['prefLabel'])] = $concept;
       }
       return $bydate;
     }
 
-    public function getTitle($lang=null) {
+    public function getTitle($lang = null) {
       return $this->config->getTitle($lang);
     }
     

model/VocabularyConfig.php

Braces +15 added lines, -8 removed lines

@@ -43,8 +43,9 @@ 
 
         // not found with selected language, try any language
         $literal = $this->resource->getLiteral($property);
-        if ($literal)
-          return $literal->getValue();
+        if ($literal) {
+                  return $literal->getValue();
+        }
     }
 
     /**
@@ -85,8 +86,9 @@ 
     public function getShortName()
     {
         $shortname = $this->getLiteral('skosmos:shortName');
-        if ($shortname) 
-          return $shortname;
+        if ($shortname) {
+                  return $shortname;
+        }
 
         // if no shortname exists fall back to the id
         return $this->getId();
@@ -205,10 +207,12 @@ 
         $ret = array();
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf_Namespace::shorten($prop) !== null) // shortening property labels if possible
+            if (EasyRdf_Namespace::shorten($prop) !== null) {
+              // shortening property labels if possible
             {
                 $prop = EasyRdf_Namespace::shorten($prop);
             }
+            }
 
             $ret[] = $prop;
         }
@@ -225,10 +229,12 @@ 
         $resources = $this->resource->allResources("skosmos:hasMultiLingualProperty");
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf_Namespace::shorten($prop) !== null) // shortening property labels if possible
+            if (EasyRdf_Namespace::shorten($prop) !== null) {
+              // shortening property labels if possible
             {
                 $prop = EasyRdf_Namespace::shorten($prop);
             }
+            }
 
             if ($prop === $property) {
                 return true;
@@ -329,11 +335,12 @@ 
     public function getId()
     {
         $uriparts = explode("#", $this->resource->getURI());
-        if (count($uriparts) != 1)
-        // hash namespace
+        if (count($uriparts) != 1) {
+                // hash namespace
         {
             return $uriparts[1];
         }
+        }
 
         // slash namespace
         $uriparts = explode("/", $this->resource->getURI());

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
 {
     private $plugins;
 
-    public function __construct($resource, $globalPlugins=array()) 
+    public function __construct($resource, $globalPlugins = array()) 
     {
         $this->resource = $resource;
         $plugins = $this->resource->allLiterals('skosmos:usePlugin');
@@ -40,7 +40,7 @@ 
      * @param string $property the property to query
      * @param string $lang preferred language for the literal,
      */
-    private function getLiteral($property, $lang=null)
+    private function getLiteral($property, $lang = null)
     {
         if (!isset($lang)) {;
             $lang = $this->getEnvLang();
@@ -72,7 +72,7 @@ 
         $langs = $this->getLanguages();
         $deflang = reset($langs); // picking the first one from the list with reset since the keys are not numeric
         if (sizeof($langs) > 1) {
-            trigger_error("Default language for vocabulary '" . $this->getShortName() . "' unknown, choosing '$deflang'.", E_USER_WARNING);
+            trigger_error("Default language for vocabulary '".$this->getShortName()."' unknown, choosing '$deflang'.", E_USER_WARNING);
         }
 
         return $deflang;

model/ConceptSearchParameters.php

Braces +3 added lines, -2 removed lines

@@ -67,8 +67,9 @@
     public function getSearchTerm() 
     {
         $term = $this->request->getQueryParam('q') ? $this->request->getQueryParam('q') : $this->request->getQueryParam('query');
-        if (!$term && $this->rest)
-            $term = $this->request->getQueryParam('label');
+        if (!$term && $this->rest) {
+                    $term = $this->request->getQueryParam('label');
+        }
         $term = trim($term); // surrounding whitespace is not considered significant
         return strpos($term, "*") === false ? $term . "*" : $term; // default to prefix search
     }

Spacing +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
         if ($this->rest) {
             return $term;
         }
-        return strpos($term, "*") === false ? $term . "*" : $term; // default to prefix search
+        return strpos($term, "*") === false ? $term."*" : $term; // default to prefix search
     }
     
     public function getContentLang() 
@@ -118,7 +118,7 @@ 
         return $type;
     }
 
-    private function getQueryParam($name, $explode=false) {
+    private function getQueryParam($name, $explode = false) {
         if ($explode) {
             return $this->request->getQueryParam($name) ? explode(' ', $this->request->getQueryParam($name)) : null;
         }

model/sparql/GenericSparql.php

Doc Comments +1 added lines, -1 removed lines

@@ -585,7 +585,7 @@
 
     /**
      * Generate a VALUES clause for limiting the targeted graphs.
-     * @param array $vocabs array of Vocabulary objects to target
+     * @param Vocabulary[] $vocabs array of Vocabulary objects to target
      * @return string VALUES clause, or "" if not necessary to limit
      */
     protected function formatValuesGraph($vocabs) {

Braces +6 added lines, -2 removed lines

@@ -56,12 +56,16 @@
         $this->model = $model;
 
         // set graphClause so that it can be used by all queries
-        if ($this->isDefaultEndpoint()) // default endpoint; query any graph (and catch it in a variable)
+        if ($this->isDefaultEndpoint()) {
+          // default endpoint; query any graph (and catch it in a variable)
         {
             $this->graphClause = "GRAPH $graph";
-        } elseif ($graph) // query a specific graph
+        }
+        } elseif ($graph) {
+          // query a specific graph
         {
             $this->graphClause = "GRAPH <$graph>";
+        }
         } else // query the default graph
         {
             $this->graphClause = "";

Spacing +20 added lines, -20 removed lines

@@ -633,7 +633,7 @@ 
         foreach ($graphs as $graph) {
           $conditions[] = "?graph=<$graph>";
         }
-        return "FILTER (" . implode('||', $conditions) . ")";
+        return "FILTER (".implode('||', $conditions).")";
     }
 
     /**
@@ -643,16 +643,16 @@ 
      * @return string sparql query clauses
      */
     protected function formatLimitAndOffset($limit, $offset) {
-        $limit = ($limit) ? 'LIMIT ' . $limit : '';
-        $offset = ($offset) ? 'OFFSET ' . $offset : '';
+        $limit = ($limit) ? 'LIMIT '.$limit : '';
+        $offset = ($offset) ? 'OFFSET '.$offset : '';
         // eliminating whitespace and line changes when the conditions aren't needed.
         $limitandoffset = '';
         if ($limit && $offset) {
-            $limitandoffset = "\n" . $limit . "\n" . $offset;
+            $limitandoffset = "\n".$limit."\n".$offset;
         } elseif ($limit) {
-            $limitandoffset = "\n" . $limit;
+            $limitandoffset = "\n".$limit;
         } elseif ($offset) {
-            $limitandoffset = "\n" . $offset;
+            $limitandoffset = "\n".$offset;
         }
 
         return $limitandoffset;
@@ -672,7 +672,7 @@ 
             }
         }
 
-        return implode(' UNION ', $typePatterns);;
+        return implode(' UNION ', $typePatterns); ;
     }
 
     /**
@@ -798,7 +798,7 @@ 
         // if search language and UI/display language differ, must also consider case where there is no prefLabel in
         // the display language; in that case, should use the label with the same language as the matched label
         $labelcondFallback = ($searchLang != $lang) ?
-          "OPTIONAL { # in case previous OPTIONAL block gives no labels\n" .
+          "OPTIONAL { # in case previous OPTIONAL block gives no labels\n".
           "?s skos:prefLabel ?label . FILTER (LANGMATCHES(LANG(?label), LANG(?match))) }" : "";
 
         /*
@@ -850,15 +850,15 @@ 
 
         $schemecond = '';
         if (!empty($schemes)) {
-            foreach($schemes as $scheme) {
+            foreach ($schemes as $scheme) {
                 $schemecond .= "?s skos:inScheme <$scheme> . ";
             }
         }
 
         // extra conditions for parent and group, if specified
-        $parentcond = ($params->getParentLimit()) ? "?s skos:broader+ <" . $params->getParentLimit() . "> ." : "";
-        $groupcond = ($params->getGroupLimit()) ? "<" . $params->getGroupLimit() . "> skos:member ?s ." : "";
-        $pgcond = $parentcond . $groupcond;
+        $parentcond = ($params->getParentLimit()) ? "?s skos:broader+ <".$params->getParentLimit()."> ." : "";
+        $groupcond = ($params->getGroupLimit()) ? "<".$params->getGroupLimit()."> skos:member ?s ." : "";
+        $pgcond = $parentcond.$groupcond;
 
         $orderextra = $this->isDefaultEndpoint() ? $this->graph : '';
 
@@ -933,9 +933,9 @@ 
                 $hit['type'][] = $this->shortenUri($typeuri);
             }
 
-            if(!empty($fields)) {
+            if (!empty($fields)) {
                 foreach ($fields as $prop) {
-                    $propname = $prop . 's';
+                    $propname = $prop.'s';
                     if (isset($row->$propname)) {
                         foreach (explode("\n", $row->$propname->getValue()) as $line) {
                             $rdata = str_getcsv($line, ',', '"', '"');
@@ -1394,7 +1394,7 @@ 
                 if (!isset($row->label) || $row->label->getLang() === $lang) {
                     $ret[$row->object->getUri()] = $val;
                 } elseif ($row->label->getLang() === $fallbacklang) {
-                    $val['label'] .= ' (' . $row->label->getLang() . ')';
+                    $val['label'] .= ' ('.$row->label->getLang().')';
                     $ret[$row->object->getUri()] = $val;
                 }
             }
@@ -1494,7 +1494,7 @@ 
                 if ($row->label->getLang() == $lang) {
                     $label = $row->label->getValue();
                 } else {
-                    $label = $row->label->getValue() . " (" . $row->label->getLang() . ")";
+                    $label = $row->label->getValue()." (".$row->label->getLang().")";
                 }
 
             }
@@ -1661,7 +1661,7 @@ 
                 if (isset($row->childlabel)) {
                     $label = $row->childlabel->getValue();
                     if ($row->childlabel->getLang() !== $lang) {
-                        $label .= " (" . $row->childlabel->getLang() . ")";
+                        $label .= " (".$row->childlabel->getLang().")";
                     }
 
                 }
@@ -1683,7 +1683,7 @@ 
             if (isset($row->label)) {
                 $preflabel = $row->label->getValue();
                 if ($row->label->getLang() !== $lang) {
-                    $preflabel .= ' (' . $row->label->getLang() . ')';
+                    $preflabel .= ' ('.$row->label->getLang().')';
                 }
 
                 $ret[$uri]['prefLabel'] = $preflabel;
@@ -1846,7 +1846,7 @@ 
                     if ($row->label->getLang() == $lang) {
                         $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue();
                     } else {
-                        $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue() . " (" . $row->label->getLang() . ")";
+                        $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue()." (".$row->label->getLang().")";
                     }
 
                 }
@@ -1887,7 +1887,7 @@ 
      */
     private function generateChangeListQuery($lang, $offset, $prop) {
         $gcl = $this->graphClause;
-        $offset = ($offset) ? 'OFFSET ' . $offset : '';
+        $offset = ($offset) ? 'OFFSET '.$offset : '';
 
         $query = <<<EOQ
 SELECT DISTINCT ?concept ?date ?label

model/VocabularyCategory.php

Doc Comments +3 added lines

@@ -10,6 +10,9 @@
  */
 class VocabularyCategory extends DataObject
 {
+    /**
+     * @param Model $model
+     */
     public function __construct($model, $resource)
     {
         if (!($model instanceof Model)) {

model/Model.php

Braces +6 added lines, -2 removed lines

@@ -101,10 +101,12 @@ 
     
     private function initializeNamespaces() {
         foreach ($this->namespaces as $prefix => $full_uri) {
-            if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) // if not already defined
+            if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) {
+              // if not already defined
             {
                 EasyRdf_Namespace::set($prefix, $full_uri);
             }
+            }
         }
     }
 
@@ -379,10 +381,12 @@ 
                 // register vocabulary ids as RDF namespace prefixes
                 $prefix = preg_replace('/\W+/', '', $voc->getId()); // strip non-word characters
                 try {
-                    if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) // if not already defined
+                    if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) {
+                      // if not already defined
                     {
                         EasyRdf_Namespace::set($prefix, $voc->getUriSpace());
                     }
+                    }
 
                 } catch (Exception $e) {
                     // not valid as namespace identifier, ignore

Spacing +7 added lines, -7 removed lines

@@ -65,15 +65,15 @@ 
     private function initializeVocabularies()
     {
         if (!file_exists($this->getConfig()->getVocabularyConfigFile())) {
-            throw new Exception($this->getConfig()->getVocabularyConfigFile() . ' is missing, please provide one.');
+            throw new Exception($this->getConfig()->getVocabularyConfigFile().' is missing, please provide one.');
         }
 
         try {
             // use APC user cache to store parsed vocabularies.ttl configuration
             if (function_exists('apc_store') && function_exists('apc_fetch')) {
                 // @codeCoverageIgnoreStart
-                $key = realpath($this->getConfig()->getVocabularyConfigFile()) . ", " . filemtime($this->getConfig()->getVocabularyConfigFile());
-                $nskey = "namespaces of " . $key;
+                $key = realpath($this->getConfig()->getVocabularyConfigFile()).", ".filemtime($this->getConfig()->getVocabularyConfigFile());
+                $nskey = "namespaces of ".$key;
                 $this->graph = apc_fetch($key);
                 $this->namespaces = apc_fetch($nskey);
                 if ($this->graph === false || $this->namespaces === false) { // was not found in cache
@@ -86,7 +86,7 @@ 
                 $this->parseVocabularies($this->getConfig()->getVocabularyConfigFile());
             }
         } catch (Exception $e) {
-            echo "Error: " . $e->getMessage();
+            echo "Error: ".$e->getMessage();
         }
     }
 
@@ -424,7 +424,7 @@ 
     public function getVocabularyCategories()
     {
         $cats = $this->graph->allOfType('skos:Concept');
-        if(empty($cats)) {
+        if (empty($cats)) {
             return array(new VocabularyCategory($this, null));
         }
 
@@ -571,7 +571,7 @@ 
         // using apc cache for the resource if available
         if (function_exists('apc_store') && function_exists('apc_fetch')) {
             // @codeCoverageIgnoreStart
-            $key = 'fetch: ' . EasyRdf_Utils::removeFragmentFromUri($uri);
+            $key = 'fetch: '.EasyRdf_Utils::removeFragmentFromUri($uri);
             $resource = apc_fetch($key);
             if ($resource === null || $resource === false) { // was not found in cache, or previous request failed
                 $resource = $this->fetchResourceFromUri($uri);
@@ -592,7 +592,7 @@ 
      */
     public function getSparqlImplementation($dialect, $endpoint, $graph)
     {
-        $classname = $dialect . "Sparql";
+        $classname = $dialect."Sparql";
 
         return new $classname($endpoint, $graph, $this);
     }

model/GlobalConfig.php

Doc Comments +3 added lines

@@ -23,6 +23,9 @@
         }
     }
     
+    /**
+     * @param string $name
+     */
     private function getConstant($name, $default)
     {
         if (defined($name) && constant($name)) {

Spacing +3 added lines, -3 removed lines

@@ -6,10 +6,10 @@ 
 class GlobalConfig {
     private $languages;
 
-    public function __construct($config_name='/../config.inc') 
+    public function __construct($config_name = '/../config.inc') 
     {
         try {
-            $file_path = dirname(__FILE__) . $config_name;
+            $file_path = dirname(__FILE__).$config_name;
             if (!file_exists($file_path)) {
                 throw new Exception('config.inc file is missing, please provide one.');
             }
@@ -18,7 +18,7 @@ 
                 $this->languages = $LANGUAGES;
             }
         } catch (Exception $e) {
-            echo "Error: " . $e->getMessage();
+            echo "Error: ".$e->getMessage();
             return;
         }
     }