NatLibFi / Skosmos

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/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, $resource, $globalPlugins=array())
+    public function __construct(Model $model, $resource, $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 +7 added lines, -7 removed lines

@@ -30,17 +30,17 @@ 
      */
     private $configModifiedTime = null;
 
-    public function __construct(Model $model, $config_name='../../config.ttl')
+    public function __construct(Model $model, $config_name = '../../config.ttl')
     {
         $this->cache = new Cache();
         try {
-            $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.');
             }
             $resource = $this->initializeConfig();
         } catch (Exception $e) {
-            echo "Error: " . $e->getMessage();
+            echo "Error: ".$e->getMessage();
             return;
         }
         parent::__construct($model, $resource);
@@ -75,8 +75,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
@@ -96,7 +96,7 @@ 
             }
             return $configResources[0];
         } catch (Exception $e) {
-            echo "Error: " . $e->getMessage();
+            echo "Error: ".$e->getMessage();
         }
         return null;
     }
@@ -329,7 +329,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/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;
 }
 
@@ -26,7 +26,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]);
@@ -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], $model->getConfig()->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");
             }