NatLibFi / Skosmos

src/controller/Controller.php

Spacing +1 added lines, -1 removed lines

@@ -220,7 +220,7 @@
     {
         if ($modifiedDate) {
             $ifModifiedSince = $this->getIfModifiedSince();
-            $this->sendHeader("Last-Modified: " . $modifiedDate->format('D, d M Y H:i:s \G\M\T'));
+            $this->sendHeader("Last-Modified: ".$modifiedDate->format('D, d M Y H:i:s \G\M\T'));
             if ($ifModifiedSince !== null && $ifModifiedSince >= $modifiedDate) {
                 $this->sendHeader("HTTP/1.0 304 Not Modified");
                 return true;

src/model/sparql/JenaTextSparql.php

Spacing +5 added lines, -5 removed lines

@@ -41,7 +41,7 @@ 
         // 1. Ensure characters with special meaning in Lucene are escaped
         $lucenemap = array();
         foreach (str_split(self::LUCENE_ESCAPE_CHARS) as $char) {
-            $lucenemap[$char] = '\\' . $char; // escape with a backslash
+            $lucenemap[$char] = '\\'.$char; // escape with a backslash
         }
         $term = strtr($term, $lucenemap);
 
@@ -128,11 +128,11 @@ 
         # make text query clause
         $lcletter = mb_strtolower($letter, 'UTF-8'); // convert to lower case, UTF-8 safe
         $langClause = $this->generateLangClause($lang);
-        $textcondPref = $this->createTextQueryCondition($letter . '*', 'skos:prefLabel', $langClause);
-        $textcondAlt = $this->createTextQueryCondition($letter . '*', 'skos:altLabel', $langClause);
-        $orderbyclause = $this->formatOrderBy("LCASE(?match)", $lang) . " STR(?s) LCASE(STR(?qualifier))";
+        $textcondPref = $this->createTextQueryCondition($letter.'*', 'skos:prefLabel', $langClause);
+        $textcondAlt = $this->createTextQueryCondition($letter.'*', 'skos:altLabel', $langClause);
+        $orderbyclause = $this->formatOrderBy("LCASE(?match)", $lang)." STR(?s) LCASE(STR(?qualifier))";
 
-        $qualifierClause = $qualifier ? "OPTIONAL { ?s <" . $qualifier->getURI() . "> ?qualifier }" : "";
+        $qualifierClause = $qualifier ? "OPTIONAL { ?s <".$qualifier->getURI()."> ?qualifier }" : "";
 
         $filterDeprecated = "";
         if (!$showDeprecated) {

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());
             }
         }
         return $conceptInfo[0];

src/model/ConceptPropertyValue.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
                 if ($this->resource->allLiterals('skos:prefLabel')) {
                     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);
                         }
                     }

src/model/VocabularyConfig.php

Spacing +3 added lines, -3 removed lines

@@ -123,7 +123,7 @@ 
                 $paramValue = $paramLiteral->getValue();
                 $paramLang = $paramLiteral->getLang();
                 if ($paramLang) {
-                    $paramName .= '_' . $paramLang;
+                    $paramName .= '_'.$paramLang;
                 }
                 $this->pluginParameters[$pluginName][$paramName] = $paramValue;
             }
@@ -155,7 +155,7 @@ 
         $labelProperty = $override->getResource('skosmos:property');
         $labelPropUri = $labelProperty->shorten();
         if (empty($this->labelOverrides[$labelPropUri])) {
-            $this->labelOverrides[$labelPropUri]  = array();
+            $this->labelOverrides[$labelPropUri] = array();
         }
         $newOverrides = array();
 
@@ -229,7 +229,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;

src/model/Concept.php

Spacing +15 added lines, -15 removed lines

@@ -146,7 +146,7 @@ 
             // We need to check all the labels in case one of them matches a subtag of the current language
             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);
                 }
             }
@@ -281,7 +281,7 @@ 
         // catch external subjects that have $res as object
         $extSubjects = $exGraph->resourcesMatching("schema:about", $res);
 
-        $propList =  array_unique(array_merge(
+        $propList = array_unique(array_merge(
             $this->DEFAULT_EXT_PROPERTIES,
             $this->getVocab()->getConfig()->getExtProperties(),
             $this->getVocab()->getConfig()->getPluginRegister()->getExtProperties()
@@ -335,7 +335,7 @@ 
      */
     private function addPropertyValues($res, $prop, &$seen)
     {
-        $resList = $res->allResources('<' . $prop . '>');
+        $resList = $res->allResources('<'.$prop.'>');
 
         foreach ($resList as $res2) {
             if ($res2->isBNode()) {
@@ -345,7 +345,7 @@ 
             $this->addResourceReifications($res, $prop, $res2, $seen);
         }
 
-        $litList = $res->allLiterals('<' . $prop . '>');
+        $litList = $res->allLiterals('<'.$prop.'>');
 
         foreach ($litList as $lit) {
             $this->graph->addLiteral($res, $prop, $lit);
@@ -734,14 +734,14 @@ 
 
             // making a human readable string from the timestamps
             if ($created != '') {
-                $ret = $this->model->getText('skosmos:created') . ' ' . (Punic\Calendar::formatDate($created, 'short', $this->getLang()));
+                $ret = $this->model->getText('skosmos:created').' '.(Punic\Calendar::formatDate($created, 'short', $this->getLang()));
             }
 
             if ($modified != '') {
                 if ($created != '') {
-                    $ret .= ', ' . $this->model->getText('skosmos:modified') . ' ' . (Punic\Calendar::formatDate($modified, 'short', $this->getLang()));
+                    $ret .= ', '.$this->model->getText('skosmos:modified').' '.(Punic\Calendar::formatDate($modified, 'short', $this->getLang()));
                 } else {
-                    $ret .= ' ' . ucfirst($this->model->getText('skosmos:modified')) . ' ' . (Punic\Calendar::formatDate($modified, 'short', $this->getLang()));
+                    $ret .= ' '.ucfirst($this->model->getText('skosmos:modified')).' '.(Punic\Calendar::formatDate($modified, 'short', $this->getLang()));
                 }
 
             }
@@ -749,12 +749,12 @@ 
             trigger_error($e->getMessage(), E_USER_WARNING);
             $ret = '';
             if ($this->resource->get('dc:modified')) {
-                $modified = (string) $this->resource->get('dc:modified');
-                $ret = $this->model->getText('skosmos:modified') . ' ' . $modified;
+                $modified = (string)$this->resource->get('dc:modified');
+                $ret = $this->model->getText('skosmos:modified').' '.$modified;
             }
             if ($this->resource->get('dc:created')) {
-                $created .= (string) $this->resource->get('dc:created');
-                $ret .= ' ' . $this->model->getText('skosmos:created') . ' ' . $created;
+                $created .= (string)$this->resource->get('dc:created');
+                $ret .= ' '.$this->model->getText('skosmos:created').' '.$created;
             }
         }
         return $ret;
@@ -810,7 +810,7 @@ 
             $arrayClassURI = $this->vocab !== null ? $this->vocab->getConfig()->getArrayClassURI() : null;
             $arrayClass = $arrayClassURI !== null ? EasyRdf\RdfNamespace::shorten($arrayClassURI) : null;
             $superGroups = $this->resource->all('isothes:superGroup');
-            $superGroupUris = array_map(function ($obj) { return $obj->getUri(); }, $superGroups);
+            $superGroupUris = array_map(function($obj) { return $obj->getUri(); }, $superGroups);
             foreach ($collections as $collection) {
                 if (in_array($arrayClass, $collection->types()) === $includeArrays) {
                     // not adding the memberOf if the reverse resource is already covered by isothes:superGroup see issue #433
@@ -876,7 +876,7 @@ 
         foreach ($labels as $lit) {
             // filtering away subsets of the current language eg. en vs en-GB
             $langCode = strval($lit->getLang());
-            if ($langCode != $this->clang && strpos($langCode, $this->getLang() . '-') !== 0) {
+            if ($langCode != $this->clang && strpos($langCode, $this->getLang().'-') !== 0) {
                 $ret[$langCode][$key][] = new ConceptPropertyValueLiteral($this->model, $this->vocab, $this->resource, $lit, $prop);
             }
         }
@@ -965,10 +965,10 @@ 
                 $context[$vocabPrefix] = $vocabUriSpace;
             } elseif ($context[$vocabPrefix] !== $vocabUriSpace) {
                 $i = 2;
-                while (isset($context[$vocabPrefix . $i]) && $context[$vocabPrefix . $i] !== $vocabUriSpace) {
+                while (isset($context[$vocabPrefix.$i]) && $context[$vocabPrefix.$i] !== $vocabUriSpace) {
                     $i += 1;
                 }
-                $context[$vocabPrefix . $i] = $vocabUriSpace;
+                $context[$vocabPrefix.$i] = $vocabUriSpace;
             }
         }
         $compactJsonLD = \ML\JsonLD\JsonLD::compact($this->graph->serialise('jsonld'), json_encode($context));

src/model/GlobalConfig.php

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
     public function __construct(Model $model, string $config_name = '../../config.ttl')
     {
         $this->cache = new Cache();
-        $this->filePath = realpath(dirname(__FILE__) . "/" . $config_name);
+        $this->filePath = realpath(dirname(__FILE__)."/".$config_name);
         if (!file_exists($this->filePath)) {
             throw new Exception('config.ttl file is missing, please provide one.');
         }
@@ -69,8 +69,8 @@ 
         // use APC user cache to store parsed config.ttl configuration
         if ($this->cache->isAvailable() && !is_null($this->configModifiedTime)) {
             // @codeCoverageIgnoreStart
-            $key = realpath($this->filePath) . ", " . $this->configModifiedTime;
-            $nskey = "namespaces of " . $key;
+            $key = realpath($this->filePath).", ".$this->configModifiedTime;
+            $nskey = "namespaces of ".$key;
             $this->graph = $this->cache->fetch($key);
             $this->namespaces = $this->cache->fetch($nskey);
             if ($this->graph === false || $this->namespaces === false) { // was not found in cache
@@ -362,7 +362,7 @@ 
     public function getGlobalPlugins()
     {
         $globalPlugins = array();
-        $globalPluginsResource =  $this->getResource()->getResource("skosmos:globalPlugins");
+        $globalPluginsResource = $this->getResource()->getResource("skosmos:globalPlugins");
         if ($globalPluginsResource) {
             foreach ($globalPluginsResource as $resource) {
                 $globalPlugins[] = $resource->getValue();

src/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();

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() . rtrim(' ' . $value->getUri())] = $value;
+        $this->values[ltrim($value->getNotation().' ').$value->getLabel().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());
                 });