NatLibFi / Skosmos

src/model/sparql/GenericSparql.php

Indentation +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
      *
      * @param string $query
      * @return string
-    */
+     */
     protected function generateQueryPrefixes($query)
     {
         // Check for undefined prefixes
@@ -126,7 +126,7 @@ 
         // configure the HTTP client used by EasyRdf\Sparql\Client
         $httpclient = EasyRdf\Http::getDefaultHttpClient();
         $httpclient->setConfig(array('timeout' => $this->model->getConfig()->getSparqlTimeout(),
-                                     'useragent' => 'Skosmos'));
+                                      'useragent' => 'Skosmos'));
 
         // if special cache control (typically no-cache) was requested by the
         // client, set the same type of cache control headers also in subsequent
@@ -1017,7 +1017,7 @@ 
         return $query;
     }
     /**
-    *  This function can be overwritten in other SPARQL dialects for the possibility of handling the different language clauses
+     *  This function can be overwritten in other SPARQL dialects for the possibility of handling the different language clauses
      * @param string $lang
      * @return string formatted language clause
      */

Spacing +31 added lines, -31 removed lines

@@ -96,7 +96,7 @@ 
     {
         $queryId = sprintf("%05d", rand(0, 99999));
         $logger = $this->model->getLogger();
-        $logger->info("[qid $queryId] SPARQL query:\n" . $this->generateQueryPrefixes($query) . "\n$query\n");
+        $logger->info("[qid $queryId] SPARQL query:\n".$this->generateQueryPrefixes($query)."\n$query\n");
         $starttime = microtime(true);
         $result = $this->client->query($query);
         $elapsed = intval(round((microtime(true) - $starttime) * 1000));
@@ -118,7 +118,7 @@ 
      */
     protected function query($query)
     {
-        $key = $this->endpoint . " " . $query;
+        $key = $this->endpoint." ".$query;
         if (!array_key_exists($key, self::$querycache)) {
             self::$querycache[$key] = $this->doQuery($query);
         }
@@ -281,9 +281,9 @@ 
         $gcl = $this->graphClause;
         $classes = ($classes) ? $classes : array('http://www.w3.org/2004/02/skos/core#Concept');
 
-        $quote_string = function ($val) { return "'$val'"; };
+        $quote_string = function($val) { return "'$val'"; };
         $quoted_values = array_map($quote_string, $langs);
-        $langFilter = "FILTER(?lang IN (" . implode(',', $quoted_values) . "))";
+        $langFilter = "FILTER(?lang IN (".implode(',', $quoted_values)."))";
 
         $values = $this->formatValues('?type', $classes, 'uri');
         $valuesProp = $this->formatValues('?prop', $props, null);
@@ -815,7 +815,7 @@ 
             $values[] = "<$graph>";
         }
         if (count($values)) {
-            return "FILTER (?graph IN (" . implode(',', $values) . "))";
+            return "FILTER (?graph IN (".implode(',', $values)."))";
         }
     }
 
@@ -827,16 +827,16 @@ 
      */
     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;
@@ -992,14 +992,14 @@ 
         // 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))) }" : "";
 
         //  Including the labels if there is no query term given.
         if ($rawterm === '') {
             $labelClause = "?s skos:prefLabel ?label .";
-            $labelClause = ($lang) ? $labelClause . " FILTER (LANGMATCHES(LANG(?label), '$lang'))" : $labelClause . "";
-            return $labelClause . " BIND(?label AS ?match)";
+            $labelClause = ($lang) ? $labelClause." FILTER (LANGMATCHES(LANG(?label), '$lang'))" : $labelClause."";
+            return $labelClause." BIND(?label AS ?match)";
         }
 
         /*
@@ -1083,9 +1083,9 @@ 
             $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
         }
         // 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 : '';
 
@@ -1173,7 +1173,7 @@ 
 
         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, ',', '"', '"');
@@ -1188,7 +1188,7 @@ 
                             $propvals = $rdata[2];
                         }
 
-                        $hit['skos:' . $prop][] = $propvals;
+                        $hit['skos:'.$prop][] = $propvals;
                     }
                 }
             }
@@ -1323,7 +1323,7 @@ 
         $conditions = $this->formatFilterConditions($letter, $lang);
         $filtercondLabel = $conditions['filterpref'];
         $filtercondALabel = $conditions['filteralt'];
-        $qualifierClause = $qualifier ? "OPTIONAL { ?s <" . $qualifier->getURI() . "> ?qualifier }" : "";
+        $qualifierClause = $qualifier ? "OPTIONAL { ?s <".$qualifier->getURI()."> ?qualifier }" : "";
         $filterDeprecated = "";
         if (!$showDeprecated) {
             $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
@@ -1820,7 +1820,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;
                 }
             }
@@ -1919,10 +1919,10 @@ 
 
             $label = null;
             if (isset($row->label)) {
-                if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang . "-") == 0) {
+                if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang."-") == 0) {
                     $label = $row->label->getValue();
                 } else {
-                    $label = $row->label->getValue() . " (" . $row->label->getLang() . ")";
+                    $label = $row->label->getValue()." (".$row->label->getLang().")";
                 }
 
             }
@@ -2000,8 +2000,8 @@ 
         foreach ($result as $row) {
             if (isset($row->top) && isset($row->label)) {
                 $label = $row->label->getValue();
-                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang . "-") !== 0) {
-                    $label .= ' (' . $row->label->getLang() . ')';
+                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang."-") !== 0) {
+                    $label .= ' ('.$row->label->getLang().')';
                 }
                 $top = array('uri' => $row->top->getUri(), 'topConceptOf' => $row->topuri->getUri(), 'label' => $label, 'hasChildren' => filter_var($row->children->getValue(), FILTER_VALIDATE_BOOLEAN));
                 if (isset($row->notation)) {
@@ -2108,8 +2108,8 @@ 
                 $label = null;
                 if (isset($row->childlabel)) {
                     $label = $row->childlabel->getValue();
-                    if ($row->childlabel->getLang() !== $lang && strpos($row->childlabel->getLang(), $lang . "-") !== 0) {
-                        $label .= " (" . $row->childlabel->getLang() . ")";
+                    if ($row->childlabel->getLang() !== $lang && strpos($row->childlabel->getLang(), $lang."-") !== 0) {
+                        $label .= " (".$row->childlabel->getLang().")";
                     }
 
                 }
@@ -2130,8 +2130,8 @@ 
             }
             if (isset($row->label)) {
                 $preflabel = $row->label->getValue();
-                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang . "-") !== 0) {
-                    $preflabel .= ' (' . $row->label->getLang() . ')';
+                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang."-") !== 0) {
+                    $preflabel .= ' ('.$row->label->getLang().')';
                 }
 
                 $ret[$uri]['prefLabel'] = $preflabel;
@@ -2298,10 +2298,10 @@ 
                     'type' => array($row->type->shorten()),
                 );
                 if (isset($row->label)) {
-                    if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang . "-") == 0) {
+                    if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang."-") == 0) {
                         $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().")";
                     }
 
                 }
@@ -2348,7 +2348,7 @@ 
     private function generateChangeListQuery($prop, $lang, $offset, $limit = 200, $showDeprecated = false)
     {
         $fcl = $this->generateFromClause();
-        $offset = ($offset) ? 'OFFSET ' . $offset : '';
+        $offset = ($offset) ? 'OFFSET '.$offset : '';
 
         //Additional clauses when deprecated concepts need to be included in the results
         $deprecatedOptions = '';

src/util/JsTranslationExtractor.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     public function extract($directory, MessageCatalogue $catalogue): void
     {
         if (!is_dir($this->directory)) {
-            echo "Invalid directory: $this->directory" . PHP_EOL;
+            echo "Invalid directory: $this->directory".PHP_EOL;
             return;
         }
         $iterator = new \RecursiveIteratorIterator(
@@ -35,7 +35,7 @@ 
             $content = file_get_contents($file->getPathname());
             preg_match_all('/\$t\([\'"]([^\'"]+)[\'"]\)/', $content, $matches);
             foreach ($matches[1] as $key) {
-                $catalogue->set($this->prefix . $key, $key);
+                $catalogue->set($this->prefix.$key, $key);
             }
         }
     }

src/model/PluginRegister.php

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
                         $ret[$name] = $files[$type];
                     } else {
                         foreach ($files[$type] as $file) {
-                            array_push($ret[$name], 'plugins/' . $name . '/' . $file);
+                            array_push($ret[$name], 'plugins/'.$name.'/'.$file);
                         }
                     }
                 }
@@ -163,7 +163,7 @@ 
     protected function flatten($array)
     {
         $return = array();
-        array_walk_recursive($array, function ($a) use (&$return) { $return[] = $a; });
+        array_walk_recursive($array, function($a) use (&$return) { $return[] = $a; });
         return $return;
     }
 

src/model/Vocabulary.php

Spacing +6 added lines, -6 removed lines

@@ -104,7 +104,7 @@ 
             return $lname;
         }
         // already a full URI
-        return $this->getUriSpace() . $lname;
+        return $this->getUriSpace().$lname;
     }
 
     /**
@@ -166,7 +166,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;
         }
@@ -199,7 +199,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);
                     }
                     $ret[$prop][] = $val;
                 }
@@ -256,7 +256,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;
@@ -327,7 +327,7 @@ 
         }
         // don't know how to parse
         $rev = $parts[2];
-        $datestr = $parts[3] . ' ' . $parts[4];
+        $datestr = $parts[3].' '.$parts[4];
 
         return "$datestr (r$rev)";
     }
@@ -457,7 +457,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());
             }
         }
         if (!$conceptInfo) {

src/model/ConceptProperty.php

Spacing +4 added lines, -4 removed lines

@@ -79,7 +79,7 @@ 
      */
     public function getDescription()
     {
-        $helpprop = $this->prop . "_help";
+        $helpprop = $this->prop."_help";
 
         // see if we have a translation with the help text
         $help = $this->model->getText($helpprop);
@@ -110,7 +110,7 @@ 
 
     public function addValue($value)
     {
-        $this->values[ltrim($value->getNotation() . ' ') . $value->getLabel(allowExternal: false) . rtrim(' ' . $value->getUri())] = $value;
+        $this->values[ltrim($value->getNotation().' ').$value->getLabel(allowExternal: false).rtrim(' '.$value->getUri())] = $value;
         $this->is_sorted = false;
     }
 
@@ -120,7 +120,7 @@ 
         # Note that getLabel() returns URIs in case of no label and may return a prefixed value which affects sorting
         if (!empty($this->values)) {
             if ($this->sort_by_notation) {
-                uasort($this->values, function ($a, $b) {
+                uasort($this->values, function($a, $b) {
                     $anot = $a->getNotation();
                     $bnot = $b->getNotation();
                     if ($anot == null) {
@@ -141,7 +141,7 @@ 
                     }
                 });
             } else {
-                uasort($this->values, function ($a, $b) {
+                uasort($this->values, function($a, $b) {
                     // assume that sort keys are unique
                     return strcoll($a->getSortKey(), $b->getSortKey());
                 });

src/model/ConceptMappingPropertyValue.php

Spacing +10 added lines, -10 removed lines

@@ -36,7 +36,7 @@ 
     {
         $label = $this->getLabel();
         $notation = $this->getNotation();
-        return ltrim($notation . ' ') . $label;
+        return ltrim($notation.' ').$label;
     }
 
     public function getType()
@@ -46,7 +46,7 @@ 
 
     public function getLabel($lang = '', $allowExternal = true)
     {
-        $key = $lang . "/" . ($allowExternal ? "true" : "false");
+        $key = $lang."/".($allowExternal ? "true" : "false");
         if (isset($this->labelcache[$key])) {
             return $this->labelcache[$key];
         }
@@ -58,7 +58,7 @@ 
 
     public function getSortKey()
     {
-        return strtolower($this->getVocabName() . ": " . $this->getLabel());
+        return strtolower($this->getVocabName().": ".$this->getLabel());
     }
 
     private function queryLabel($lang = '', $allowExternal = true)
@@ -187,25 +187,25 @@ 
             'from' => [
                 'memberSet' => [
                     [
-                        'uri' => (string) $this->source->getUri(),
+                        'uri' => (string)$this->source->getUri(),
                     ]
                 ]
             ],
             'to' => [
                 'memberSet' => [
                     [
-                        'uri' => (string) $this->getUri()
+                        'uri' => (string)$this->getUri()
                     ]
                 ]
             ],
             // EXTRA
             'hrefLink' => $hrefLink, // link to resource as displayed in the UI
             'lang' => $propertyLang, // TBD: could it be part of the prefLabel?
-            'vocabName' => (string) $this->getVocabName(), // vocabulary as displayed in the UI
+            'vocabName' => (string)$this->getVocabName(), // vocabulary as displayed in the UI
             'typeLabel' => $this->model->getText($this->type), // a text used in the UI instead of, for example, skos:closeMatch
         ];
 
-        $helpprop = $this->type . "_help";
+        $helpprop = $this->type."_help";
         // see if we have a translation for the property help text
         $help = $this->model->getText($helpprop);
         if ($help != $helpprop) {
@@ -215,20 +215,20 @@ 
         $fromScheme = $this->vocab->getDefaultConceptScheme();
         if (isset($fromScheme)) {
             $ret['fromScheme'] = [
-                'uri' => (string) $fromScheme,
+                'uri' => (string)$fromScheme,
             ];
         }
 
         $exvocab = $this->getExvocab();
         if (isset($exvocab)) {
             $ret['toScheme'] = [
-                'uri' => (string) $exvocab->getDefaultConceptScheme(),
+                'uri' => (string)$exvocab->getDefaultConceptScheme(),
             ];
         }
 
         $notation = $this->getNotation();
         if (isset($notation)) {
-            $ret['to']['memberSet'][0]['notation'] = (string) $notation;
+            $ret['to']['memberSet'][0]['notation'] = (string)$notation;
         }
 
         $label = $this->getLabel($lang, $allowExternal);