NatLibFi / Skosmos

src/model/ConceptProperty.php

Spacing +5 added lines, -5 removed lines

@@ -30,7 +30,7 @@ 
      * @param string $super URI of superproperty
      * @param boolean $sort_by_notation whether to sort the property values by their notation code
      */
-    public function __construct($model, $prop, $label, $tooltip=null, $super=null, $sort_by_notation=false)
+    public function __construct($model, $prop, $label, $tooltip = null, $super = null, $sort_by_notation = false)
     {
         $this->model = $model;
         $this->prop = $prop;
@@ -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());
                 });

src/model/ConceptMappingPropertyValue.php

Spacing +9 added lines, -9 removed lines

@@ -36,7 +36,7 @@ 
     {
         $label = $this->getLabel();
         $notation = $this->getNotation();
-        return ltrim($notation . ' ') . $label;
+        return ltrim($notation.' ').$label;
     }
 
     public function getType()
@@ -57,7 +57,7 @@ 
 
     public function getSortKey()
     {
-        return strtolower($this->getVocabName() . ": " . $this->getLabel());
+        return strtolower($this->getVocabName().": ".$this->getLabel());
     }
 
     private function queryLabel($lang = '', $queryExVocabs = true)
@@ -186,25 +186,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) {
@@ -214,20 +214,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, $queryExVocabs);

src/controller/WebController.php

Spacing +21 added lines, -21 removed lines

@@ -37,9 +37,9 @@ 
         }
 
         // specify where to look for templates and cache
-        $loader = new \Twig\Loader\FilesystemLoader(__DIR__ . '/../view');
+        $loader = new \Twig\Loader\FilesystemLoader(__DIR__.'/../view');
         // initialize Twig environment
-        $this->twig = new \Twig\Environment($loader, array('cache' => $tmpDir,'auto_reload' => true));
+        $this->twig = new \Twig\Environment($loader, array('cache' => $tmpDir, 'auto_reload' => true));
         // used for setting the base href for the relative urls
         $this->twig->addGlobal("BaseHref", $this->getBaseHref());
 
@@ -53,7 +53,7 @@ 
         $this->twig->addFilter(new \Twig\TwigFilter('link_url', array($this, 'linkUrlFilter')));
 
         // register a Twig filter for generating strings from language codes with CLDR
-        $langFilter = new \Twig\TwigFilter('lang_name', function ($langcode, $lang) {
+        $langFilter = new \Twig\TwigFilter('lang_name', function($langcode, $lang) {
             return Language::getName($langcode, $lang);
         });
         $this->twig->addFilter($langFilter);
@@ -239,16 +239,16 @@ 
 
     private function createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender)
     {
-        $headers = "MIME-Version: 1.0" . "\r\n";
-        $headers .= "Content-type: text/html; charset=UTF-8" . "\r\n";
+        $headers = "MIME-Version: 1.0"."\r\n";
+        $headers .= "Content-type: text/html; charset=UTF-8"."\r\n";
         if (!empty($toMail)) {
-            $headers .= "Cc: " . $this->model->getConfig()->getFeedbackAddress() . "\r\n";
+            $headers .= "Cc: ".$this->model->getConfig()->getFeedbackAddress()."\r\n";
         }
         if (!empty($fromEmail)) {
             $headers .= "Reply-To: $fromName <$fromEmail>\r\n";
         }
         $service = $this->model->getConfig()->getServiceName();
-        return $headers . "From: $fromName via $service <$sender>";
+        return $headers."From: $fromName via $service <$sender>";
     }
 
     /**
@@ -262,9 +262,9 @@ 
     public function sendFeedback($request, $message, $messageSubject, $fromName = null, $fromEmail = null, $fromVocab = null, $toMail = null)
     {
         $toAddress = ($toMail) ? $toMail : $this->model->getConfig()->getFeedbackAddress();
-        $messageSubject = "[" . $this->model->getConfig()->getServiceName() . "] " . $messageSubject;
+        $messageSubject = "[".$this->model->getConfig()->getServiceName()."] ".$messageSubject;
         if ($fromVocab !== null && $fromVocab !== '') {
-            $message = 'Feedback from vocab: ' . strtoupper($fromVocab) . "<br />" . $message;
+            $message = 'Feedback from vocab: '.strtoupper($fromVocab)."<br />".$message;
         }
         $envelopeSender = $this->model->getConfig()->getFeedbackEnvelopeSender();
         // determine the sender address of the message
@@ -283,10 +283,10 @@ 
         $headers = $this->createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender);
         $params = empty($envelopeSender) ? '' : "-f $envelopeSender";
         // adding some information about the user for debugging purposes.
-        $message = $message . "<br /><br /> Debugging information:"
-            . "<br />Timestamp: " . date(DATE_RFC2822)
-            . "<br />User agent: " . $request->getServerConstant('HTTP_USER_AGENT')
-            . "<br />Referer: " . $request->getServerConstant('HTTP_REFERER');
+        $message = $message."<br /><br /> Debugging information:"
+            . "<br />Timestamp: ".date(DATE_RFC2822)
+            . "<br />User agent: ".$request->getServerConstant('HTTP_USER_AGENT')
+            . "<br />Referer: ".$request->getServerConstant('HTTP_REFERER');
 
         try {
             mail($toAddress, $messageSubject, $message, $headers, $params);
@@ -294,7 +294,7 @@ 
             header("HTTP/1.0 404 Not Found");
             $template = $this->twig->load('error.twig');
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
 
             echo $template->render(
@@ -341,13 +341,13 @@ 
         $vocids = ($vocabs !== null && $vocabs !== '') ? explode(' ', $vocabs) : null;
         $vocabObjects = array();
         if ($vocids) {
-            foreach($vocids as $vocid) {
+            foreach ($vocids as $vocid) {
                 try {
                     $vocabObjects[] = $this->model->getVocabulary($vocid);
                 } catch (ValueError $e) {
                     // fail fast with an error page if the vocabulary cannot be found
                     if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                        error_log('Caught exception: ' . $e->getMessage());
+                        error_log('Caught exception: '.$e->getMessage());
                     }
                     header("HTTP/1.0 400 Bad Request");
                     $this->invokeGenericErrorPage($request, $e->getMessage());
@@ -369,7 +369,7 @@ 
             $errored = true;
             header("HTTP/1.0 500 Internal Server Error");
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
         }
         $vocabList = $this->model->getVocabularyList();
@@ -381,7 +381,7 @@ 
                 'search_count' => $counts,
                 'languages' => $this->languages,
                 'search_results' => $searchResults,
-                'rest' => $parameters->getOffset()>0,
+                'rest' => $parameters->getOffset() > 0,
                 'global_search' => true,
                 'search_failed' => $errored,
                 'term' => $request->getQueryParamRaw('q'),
@@ -409,7 +409,7 @@ 
         } catch (Exception $e) {
             header("HTTP/1.0 500 Internal Server Error");
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
 
             echo $template->render(
@@ -434,7 +434,7 @@ 
         } catch (Exception $e) {
             header("HTTP/1.0 404 Not Found");
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
 
             echo $template->render(
@@ -453,7 +453,7 @@ 
                 'vocab' => $vocab,
                 'search_results' => $searchResults,
                 'search_count' => $counts,
-                'rest' => $parameters->getOffset()>0,
+                'rest' => $parameters->getOffset() > 0,
                 'limit_parent' => $parameters->getParentLimit(),
                 'limit_type' =>  $request->getQueryParam('type') ? explode('+', $request->getQueryParam('type')) : null,
                 'limit_group' => $parameters->getGroupLimit(),

src/model/Model.php

Spacing +11 added lines, -11 removed lines

@@ -29,7 +29,7 @@ 
     /**
      * Initializes the Model object
      */
-    public function __construct(string $config_filename="../../config.ttl")
+    public function __construct(string $config_filename = "../../config.ttl")
     {
         $this->resolver = new Resolver($this);
         $this->globalConfig = new GlobalConfig($this, $config_filename);
@@ -40,7 +40,7 @@ 
                 $this->translator = new Translator($langcode);
             }
             $this->translator->addLoader('po', new PoFileLoader());
-            $this->translator->addResource('po', __DIR__.'/../../resource/translations/skosmos_' . $langcode . '.po', $langcode);
+            $this->translator->addResource('po', __DIR__.'/../../resource/translations/skosmos_'.$langcode.'.po', $langcode);
         }
         $this->initializeLogging();
     }
@@ -274,11 +274,11 @@ 
         }
 
         $vocabs = $params->getVocabs();
-        $showDeprecated=false;
+        $showDeprecated = false;
         if (sizeof($vocabs) === 1) { // search within vocabulary
             $voc = $vocabs[0];
             $sparql = $voc->getSparql();
-            $showDeprecated=$voc->getConfig()->getShowDeprecated();
+            $showDeprecated = $voc->getConfig()->getShowDeprecated();
         } else { // multi-vocabulary or global search
             $voc = null;
             $sparql = $this->getDefaultSparql();
@@ -439,7 +439,7 @@ 
     public function getVocabularyCategories()
     {
         $cats = $this->globalConfig->getGraph()->allOfType('skos:Concept');
-        if(empty($cats)) {
+        if (empty($cats)) {
             return array(new VocabularyCategory($this, null));
         }
 
@@ -520,9 +520,9 @@ 
         }
 
         // if there are multiple vocabularies and one is the preferred vocabulary, return it
-        if($preferredVocabId != null) {
+        if ($preferredVocabId != null) {
             foreach ($vocabs as $vocab) {
-                if($vocab->getId() == $preferredVocabId) {
+                if ($vocab->getId() == $preferredVocabId) {
                     try {
                         // double check that a label exists in the preferred vocabulary
                         if ($vocab->getConceptLabel($uri, null) !== null) {
@@ -533,7 +533,7 @@ 
                         }
                     } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
                         if ($this->getConfig()->getLogCaughtExceptions()) {
-                            error_log('Caught exception: ' . $e->getMessage());
+                            error_log('Caught exception: '.$e->getMessage());
                         }
                         break;
                     }
@@ -549,7 +549,7 @@ 
                 }
             } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
                 if ($this->getConfig()->getLogCaughtExceptions()) {
-                    error_log('Caught exception: ' . $e->getMessage());
+                    error_log('Caught exception: '.$e->getMessage());
                 }
                 break;
             }
@@ -622,7 +622,7 @@ 
         // using apc cache for the resource if available
         if ($this->globalConfig->getCache()->isAvailable()) {
             // @codeCoverageIgnoreStart
-            $key = 'fetch: ' . $uri;
+            $key = 'fetch: '.$uri;
             $resource = $this->globalConfig->getCache()->fetch($key);
             if ($resource === null || $resource === false) { // was not found in cache, or previous request failed
                 $resource = $this->resolver->resolve($uri, $this->getConfig()->getHttpTimeout());
@@ -643,7 +643,7 @@ 
      */
     public function getSparqlImplementation($dialect, $endpoint, $graph)
     {
-        $classname = $dialect . "Sparql";
+        $classname = $dialect."Sparql";
 
         return new $classname($endpoint, $graph, $this);
     }

src/index.php

Spacing +7 added lines, -7 removed lines

@@ -9,7 +9,7 @@ 
     }
     require_once '../vendor/autoload.php';
 } catch (Exception $e) {
-    echo "Error: " . $e->getMessage();
+    echo "Error: ".$e->getMessage();
     return;
 }
 
@@ -17,7 +17,7 @@ 
     $model = new Model();
 } catch (Exception $e) {
     header("HTTP/1.1 500 Internal Server Error");
-    echo "Error: " . $e->getMessage();
+    echo "Error: ".$e->getMessage();
     exit(1);
 }
 
@@ -33,7 +33,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], $model->getConfig()->getLanguages())) { // global pages
         $request->setLang($parts[1]);
@@ -63,8 +63,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], $model->getConfig()->getLanguages())) {
                 $lang = $parts[2];
@@ -105,10 +105,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");
             }

src/model/VocabularyConfig.php

Spacing +4 added lines, -4 removed lines

@@ -30,7 +30,7 @@ 
     "skos:related", "skos:historyNote", "skosmos:memberOf",
     "skosmos:memberOfArray");
 
-    public function __construct(Model $model, EasyRdf\Resource $resource, array $globalPlugins=array())
+    public function __construct(Model $model, EasyRdf\Resource $resource, array $globalPlugins = array())
     {
         parent::__construct($model, $resource);
         $this->globalPlugins = $globalPlugins;
@@ -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/GlobalConfig.php

Spacing +5 added lines, -5 removed lines

@@ -30,10 +30,10 @@ 
      */
     private $configModifiedTime = null;
 
-    public function __construct(Model $model, string $config_name='../../config.ttl')
+    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
@@ -319,7 +319,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();