NatLibFi / Skosmos

model/Vocabulary.php

Indentation +10 added lines, -10 removed lines

@@ -163,10 +163,10 @@ 
             $sparql = $this->getSparql();
             $result = $sparql->queryConceptScheme($defaultcs);
         } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
-             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                 error_log('Caught exception: ' . $e->getMessage());
-             }
-             return null;
+              if ($this->model->getConfig()->getLogCaughtExceptions()) {
+                  error_log('Caught exception: ' . $e->getMessage());
+              }
+              return null;
         }
         $conceptscheme = $result->resource($defaultcs);
         $this->order = array(
@@ -253,9 +253,9 @@ 
         try {
             $conceptSchemes = $this->getSparql()->queryConceptSchemes($lang);
         } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
-             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                 error_log('Caught exception: ' . $e->getMessage());
-             }
+              if ($this->model->getConfig()->getLogCaughtExceptions()) {
+                  error_log('Caught exception: ' . $e->getMessage());
+              }
         }
         return $conceptSchemes;
     }
@@ -453,9 +453,9 @@ 
         try {
             $conceptInfo = $sparql->queryConceptInfo($uri, $this->config->getArrayClassURI(), array($this), $clang);
         } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
-             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                 error_log('Caught exception: ' . $e->getMessage());
-             }
+              if ($this->model->getConfig()->getLogCaughtExceptions()) {
+                  error_log('Caught exception: ' . $e->getMessage());
+              }
         }
         return $conceptInfo;
     }

Braces +3 added lines, -1 removed lines

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

Spacing +8 added lines, -8 removed lines

@@ -105,7 +105,7 @@ 
             return $lname;
         }
         // already a full URI
-        return $this->getUriSpace() . $lname;
+        return $this->getUriSpace().$lname;
     }
 
     /**
@@ -167,7 +167,7 @@ 
             $result = $sparql->queryConceptScheme($defaultcs);
         } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
              if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                 error_log('Caught exception: ' . $e->getMessage());
+                 error_log('Caught exception: '.$e->getMessage());
              }
              return null;
         }
@@ -204,7 +204,7 @@ 
                 foreach ($conceptscheme->allLiterals($prop, null) as $val) {
                     $prop = (substr($prop, 0, 5) == 'dc11:') ? str_replace('dc11:', 'dc:', $prop) : $prop;
                     if ($val->getValue() instanceof DateTime) {
-                        $val = Punic\Calendar::formatDate($val->getValue(), 'full', $lang) . ' ' . Punic\Calendar::format($val->getValue(), 'HH:mm:ss', $lang);
+                        $val = Punic\Calendar::formatDate($val->getValue(), 'full', $lang).' '.Punic\Calendar::format($val->getValue(), 'HH:mm:ss', $lang);
                     }
                     if ($prop === 'dc:description') {
                         $ret[$prop] = [$val->getValue() => $val]; // override description from vocabulary config
@@ -265,7 +265,7 @@ 
             $conceptSchemes = $this->getSparql()->queryConceptSchemes($lang);
         } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
              if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                 error_log('Caught exception: ' . $e->getMessage());
+                 error_log('Caught exception: '.$e->getMessage());
              }
         }
         return $conceptSchemes;
@@ -336,7 +336,7 @@ 
         }
         // don't know how to parse
         $rev = $parts[2];
-        $datestr = $parts[3] . ' ' . $parts[4];
+        $datestr = $parts[3].' '.$parts[4];
 
         return "$datestr (r$rev)";
     }
@@ -347,7 +347,7 @@ 
      * @param string $array the uri of the concept array class, eg. isothes:ThesaurusArray
      * @param string $group the uri of the  concept group class, eg. isothes:ConceptGroup
      */
-    public function getStatistics($lang = '', $array=null, $group=null)
+    public function getStatistics($lang = '', $array = null, $group = null)
     {
         $sparql = $this->getSparql();
         // find the number of concepts
@@ -465,7 +465,7 @@ 
             $conceptInfo = $sparql->queryConceptInfo($uri, $this->config->getArrayClassURI(), array($this), $clang);
         } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
              if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                 error_log('Caught exception: ' . $e->getMessage());
+                 error_log('Caught exception: '.$e->getMessage());
              }
         }
         return $conceptInfo;
@@ -676,7 +676,7 @@ 
         return $this->getSparql()->queryChangeList($prop, $clang, $offset, $limit, $showDeprecated);
     }
 
-    public function getTitle($lang=null) {
+    public function getTitle($lang = null) {
       return $this->config->getTitle($lang);
     }
 

model/VocabularyConfig.php

Braces +16 added lines, -9 removed lines

@@ -52,8 +52,7 @@ 
             foreach ($vocabularyPlugins as $plugin) {
                 if ($plugin instanceof EasyRdf\Literal) {
                     $pluginArray[] = $plugin->getValue();
-                }
-                else {
+                } else {
                     $pluginArray[] = $plugin->getLiteral('skosmos:usePlugin')->getValue();
                 }
             }
@@ -202,8 +201,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();
@@ -353,10 +353,12 @@ 
         $ret = array();
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf\RdfNamespace::shorten($prop) !== null) // shortening property labels if possible
+            if (EasyRdf\RdfNamespace::shorten($prop) !== null) {
+              // shortening property labels if possible
             {
                 $prop = EasyRdf\RdfNamespace::shorten($prop);
             }
+            }
 
             $ret[] = $prop;
         }
@@ -373,10 +375,12 @@ 
         $resources = $this->resource->allResources("skosmos:hasMultiLingualProperty");
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf\RdfNamespace::shorten($prop) !== null) // shortening property labels if possible
+            if (EasyRdf\RdfNamespace::shorten($prop) !== null) {
+              // shortening property labels if possible
             {
                 $prop = EasyRdf\RdfNamespace::shorten($prop);
             }
+            }
 
             if ($prop === $property) {
                 return true;
@@ -514,11 +518,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());
@@ -546,10 +551,12 @@ 
         $ret = array();
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf\RdfNamespace::shorten($prop) !== null) // prefixing if possible
+            if (EasyRdf\RdfNamespace::shorten($prop) !== null) {
+              // prefixing if possible
             {
                 $prop = EasyRdf\RdfNamespace::shorten($prop);
             }
+            }
 
             $ret[] = $prop;
         }

Spacing +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
     "skos:related", "skos:historyNote", "skosmos:memberOf",
     "skosmos:memberOfArray");
 
-    public function __construct($resource, $globalPlugins=array())
+    public function __construct($resource, $globalPlugins = array())
     {
         $this->resource = $resource;
         $this->globalPlugins = $globalPlugins;
@@ -118,7 +118,7 @@ 
                 $paramValue = $paramLiteral->getValue();
                 $paramLang = $paramLiteral->getLang();
                 if ($paramLang) {
-                    $paramName .= '_' . $paramLang;
+                    $paramName .= '_'.$paramLang;
                 }
                 $this->pluginParameters[$pluginName][$paramName] = $paramValue;
             }
@@ -150,7 +150,7 @@ 
         $labelProperty = $override->getResource('skosmos:property');
         $labelPropUri = $labelProperty->shorten();
         if (empty($this->labelOverrides[$labelPropUri])) {
-            $this->labelOverrides[$labelPropUri]  = array();
+            $this->labelOverrides[$labelPropUri] = array();
         }
         $newOverrides = array();
 
@@ -224,7 +224,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;

Indentation +1 added lines, -1 removed lines

@@ -159,7 +159,7 @@
         }
         $descriptions = $override->allLiterals('rdfs:comment'); //optionally override property label tooltips
         foreach ($descriptions as $description) {
-             $newOverrides['description'][$description->getLang()] = $description->getValue();
+              $newOverrides['description'][$description->getLang()] = $description->getValue();
         }
         $this->labelOverrides[$labelPropUri] = array_merge($newOverrides, $this->labelOverrides[$labelPropUri]);
     }

model/LabelSkosXL.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     public function getPrefLabel() {
         $label = null;
         $labels = $this->resource->allResources('skosxl:prefLabel');
-        foreach($labels as $labres) {
+        foreach ($labels as $labres) {
             $label = $labres->getLiteral('skosxl:literalForm');
             if ($label->getLang() == $this->clang) {
                 return $label;
@@ -23,7 +23,7 @@ 
     public function getProperties() {
         $ret = array();
         $props = $this->resource->properties();
-        foreach($props as $prop) {
+        foreach ($props as $prop) {
             if ($prop !== 'rdf:type' && $prop !== 'skosxl:literalForm') {
                 // make sure to use the correct gettext keys for DC namespace
                 $propkey = str_starts_with($prop, 'dc11:') ?

model/ConceptPropertyValue.php

Spacing +3 added lines, -3 removed lines

@@ -53,9 +53,9 @@ 
                 }
                 // We need to check all the labels in case one of them matches a subtag of the current language
                 if ($this->resource->allLiterals('skos:prefLabel')) {
-                    foreach($this->resource->allLiterals('skos:prefLabel') as $label) {
+                    foreach ($this->resource->allLiterals('skos:prefLabel') as $label) {
                         // the label lang code is a subtag of the UI lang eg. en-GB - create a new literal with the main language
-                        if ($label !== null && strpos($label->getLang(), $fallback . '-') === 0) {
+                        if ($label !== null && strpos($label->getLang(), $fallback.'-') === 0) {
                             return EasyRdf\Literal::create($label, $fallback);
                         }
                     }
@@ -156,7 +156,7 @@ 
     public function getReifiedPropertyValues() {
         $ret = array();
         $props = $this->resource->propertyUris();
-        foreach($props as $prop) {
+        foreach ($props as $prop) {
             $prop = (EasyRdf\RdfNamespace::shorten($prop) !== null) ? EasyRdf\RdfNamespace::shorten($prop) : $prop;
             $propkey = str_starts_with($prop, 'dc11:') ?
                 str_replace('dc11:', 'dc:', $prop) : $prop;

model/ConceptSearchParameters.php

Spacing +2 added lines, -2 removed lines

@@ -71,11 +71,11 @@
         if ((!isset($term) || strlen(trim($term)) === 0) && $this->rest)
             $term = $this->request->getQueryParamRaw('label');
         $term = trim(strval($term)); // surrounding whitespace is not considered significant
-        $term = Normalizer::normalize( $term, Normalizer::FORM_C ); //Normalize decomposed unicode characters #1184
+        $term = Normalizer::normalize($term, Normalizer::FORM_C); //Normalize decomposed unicode characters #1184
         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()

Braces +3 added lines, -2 removed lines

@@ -68,8 +68,9 @@
     public function getSearchTerm() : string
     {
         $term = $this->request->getQueryParamRaw('q') !== null ? $this->request->getQueryParamRaw('q') : $this->request->getQueryParamRaw('query');
-        if ((!isset($term) || strlen(trim($term)) === 0) && $this->rest)
-            $term = $this->request->getQueryParamRaw('label');
+        if ((!isset($term) || strlen(trim($term)) === 0) && $this->rest) {
+                    $term = $this->request->getQueryParamRaw('label');
+        }
         $term = trim(strval($term)); // surrounding whitespace is not considered significant
         $term = Normalizer::normalize( $term, Normalizer::FORM_C ); //Normalize decomposed unicode characters #1184
         if ($this->rest) {

model/ConceptPropertyValueLiteral.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,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();
@@ -95,7 +95,7 @@ 
     {
         $graph = $this->resource->getGraph();
         $labelResources = $graph->resourcesMatching('skosxl:literalForm', $this->literal);
-        foreach($labelResources as $labres) {
+        foreach ($labelResources as $labres) {
           $xlLabel = new LabelSkosXL($this->model, $labres);
           if ($xlLabel->getLang() == $this->getLang()) {
             return $xlLabel;

index.php

Spacing +6 added lines, -6 removed lines

@@ -9,7 +9,7 @@ 
     }
     require_once 'vendor/autoload.php';
 } catch (Exception $e) {
-    echo "Error: " . $e->getMessage();
+    echo "Error: ".$e->getMessage();
     return;
 }
 
@@ -27,7 +27,7 @@ 
     // if language code missing, redirect to guessed language
     // in any case, redirect to <lang>/
     $lang = sizeof($parts) == 2 && $parts[1] !== '' ? $parts[1] : $controller->guessLanguage($request);
-    header("Location: " . $lang . "/");
+    header("Location: ".$lang."/");
 } else {
   if (array_key_exists($parts[1], $config->getLanguages())) { // global pages
         $request->setLang($parts[1]);
@@ -56,8 +56,8 @@ 
         }
         if (sizeof($parts) == 3) { // language code missing
             $lang = $controller->guessLanguage($request);
-            $newurl = $controller->getBaseHref() . $vocab . "/" . $lang . "/";
-            header("Location: " . $newurl);
+            $newurl = $controller->getBaseHref().$vocab."/".$lang."/";
+            header("Location: ".$newurl);
         } else {
             if (array_key_exists($parts[2], $config->getLanguages())) {
                 $lang = $parts[2];
@@ -98,10 +98,10 @@ 
                 }
             } else { // language code missing, redirect to some language version
                 $lang = $controller->guessLanguage($request, $vocab);
-                $newurl = $controller->getBaseHref() . $vocab . "/" . $lang . "/" . implode('/', array_slice($parts, 2));
+                $newurl = $controller->getBaseHref().$vocab."/".$lang."/".implode('/', array_slice($parts, 2));
                 $qs = $request->getServerConstant('QUERY_STRING');
                 if ($qs) {
-                    $newurl .= "?" . $qs;
+                    $newurl .= "?".$qs;
                 }
                 header("Location: $newurl");
             }

model/Request.php

Spacing +3 added lines, -3 removed lines

@@ -123,7 +123,7 @@ 
      * @param int $maxlength maximum length of parameter, or null if unlimited
      * @return string parameter content, or null if no parameter found
      */
-    public function getQueryParamPOST($paramName, $maxlength=null)
+    public function getQueryParamPOST($paramName, $maxlength = null)
     {
         if (!isset($this->queryParamsPOST[$paramName])) return null;
         $val = filter_var($this->queryParamsPOST[$paramName], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
@@ -214,7 +214,7 @@ 
 
     public function getRequestUri()
     {
-        return $this->getServerConstant('HTTP_HOST') . $this->getServerConstant('REQUEST_URI');
+        return $this->getServerConstant('HTTP_HOST').$this->getServerConstant('REQUEST_URI');
     }
 
     /**
@@ -222,7 +222,7 @@ 
      * @param string $newlang new UI language to set
      * @return string the relative url of the page
      */
-    public function getLangUrl($newlang=null)
+    public function getLangUrl($newlang = null)
     {
         $script_name = str_replace('/index.php', '', $this->getServerConstant('SCRIPT_NAME'));
         $langurl = substr(str_replace($script_name, '', strval($this->getServerConstant('REQUEST_URI'))), 1);

Braces +15 added lines, -5 removed lines

@@ -102,7 +102,9 @@ 
      */
     public function getQueryParam($paramName)
     {
-        if (!isset($this->queryParams[$paramName])) return null;
+        if (!isset($this->queryParams[$paramName])) {
+          return null;
+        }
         $val = filter_var($this->queryParams[$paramName], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
         return ($val !== null ? str_replace('\\', '', $val) : null);
     }
@@ -125,7 +127,9 @@ 
      */
     public function getQueryParamPOST($paramName, $maxlength=null)
     {
-        if (!isset($this->queryParamsPOST[$paramName])) return null;
+        if (!isset($this->queryParamsPOST[$paramName])) {
+          return null;
+        }
         $val = filter_var($this->queryParamsPOST[$paramName], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
         if ($maxlength !== null) {
             return substr($val, 0, $maxlength);
@@ -145,13 +149,17 @@ 
 
     public function getServerConstant($paramName)
     {
-        if (!isset($this->serverConstants[$paramName])) return null;
+        if (!isset($this->serverConstants[$paramName])) {
+          return null;
+        }
         return filter_var($this->serverConstants[$paramName], FILTER_SANITIZE_ADD_SLASHES);
     }
 
     public function getCookie($paramName)
     {
-        if (!isset($this->cookies[$paramName])) return null;
+        if (!isset($this->cookies[$paramName])) {
+          return null;
+        }
         return filter_var($this->cookies[$paramName], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
     }
 
@@ -292,9 +300,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);
         }