NatLibFi / Skosmos

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);

src/controller/GlobalUrlExtension.php

Spacing +3 added lines, -3 removed lines

@@ -27,14 +27,14 @@ 
 
         // Build base URL
         if ($vocabid && $vocabid !== '') {
-            $url = $vocabid . '/';
+            $url = $vocabid.'/';
         }
 
         $url .= $lang;
 
         // Add page suffix for non-home pages
         if ($page !== 'home') {
-            $url .= '/' . $page;
+            $url .= '/'.$page;
         }
 
         // Build query parameters
@@ -52,7 +52,7 @@ 
 
         // Append parameters if any
         if (!empty($params)) {
-            $url .= '?' . http_build_query($params);
+            $url .= '?'.http_build_query($params);
         }
 
         return $url;

src/controller/WebController.php

Spacing +22 added lines, -22 removed lines

@@ -37,9 +37,9 @@ 
         }
 
         // specify where to look for templates and cache
-        $loader = new \Twig\Loader\FilesystemLoader([__DIR__ . '/../../custom-templates', __DIR__ . '/../view']);
+        $loader = new \Twig\Loader\FilesystemLoader([__DIR__.'/../../custom-templates', __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());
 
@@ -56,7 +56,7 @@ 
         $this->twig->addExtension(new LinkUrlExtension($model));
 
         // 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);
@@ -83,16 +83,16 @@ 
      */
     public function findCustomTemplates($dir)
     {
-        $customTemplateSubDirs = glob($dir . '/*', GLOB_ONLYDIR);
+        $customTemplateSubDirs = glob($dir.'/*', GLOB_ONLYDIR);
         $customTemplates = [];
 
         foreach ($customTemplateSubDirs as $slotDir) {
             $slotName = basename($slotDir);
-            $files = glob($slotDir . '/*.twig');
+            $files = glob($slotDir.'/*.twig');
             // Strip the directory part to make the file paths relative to the directory.
             // The "custom-templates" directory is registered to the Twig FilesystemLoader.
-            $customTemplates[$slotName] = array_map(function ($file) use ($dir) {
-                return str_replace($dir . '/', '', $file);
+            $customTemplates[$slotName] = array_map(function($file) use ($dir) {
+                return str_replace($dir.'/', '', $file);
             }, $files);
         }
 
@@ -269,16 +269,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>";
     }
 
     /**
@@ -292,9 +292,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
@@ -313,10 +313,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);
@@ -324,7 +324,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(
@@ -377,7 +377,7 @@ 
                 } 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());
@@ -399,7 +399,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();
@@ -439,7 +439,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(
@@ -464,7 +464,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(