NatLibFi / Skosmos

model/ConceptMappingPropertyValue.php

Doc Comments +2 added lines

@@ -169,6 +169,8 @@
 
     /**
      * Return the mapping as a JSKOS-compatible array.
+     * @param string $lang
+     * @param string $hrefLink
      * @return array
      */
     public function asJskos($queryExVocabs = true, $lang = null, $hrefLink = null)

Spacing +8 added lines, -8 removed lines

@@ -36,7 +36,7 @@ 
     {
         $label = $this->getLabel();
         $notation = $this->getNotation();
-        return $notation . $label;
+        return $notation.$label;
     }
 
     public function getType()
@@ -188,42 +188,42 @@ 
             'from' => [
                 'memberSet' => [
                     [
-                        'uri' => (string) $this->source->getUri(),
+                        'uri' => (string)$this->source->getUri(),
                     ]
                 ]
             ],
             'to' => [
                 'memberSet' => [
                     [
-                        'uri' => (string) $this->getUri()
+                        'uri' => (string)$this->getUri()
                     ]
                 ]
             ],
             // EXTRA
-            'description' => gettext($this->type . "_help"), // pop-up text
+            'description' => gettext($this->type."_help"), // pop-up text
             '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' => gettext($this->type), // a text used in the UI instead of, for example, skos:closeMatch
         ];
 
         $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(null, $queryExVocabs);

controller/Controller.php

Spacing +5 added lines, -5 removed lines

@@ -142,18 +142,18 @@ 
         $localname = $vocab->getLocalName($uri);
         if ($localname !== $uri && $localname === urlencode($localname)) {
             // check that the prefix stripping worked, and there are no problematic chars in localname
-            $paramstr = sizeof($params) > 0 ? '?' . http_build_query($params) : '';
+            $paramstr = sizeof($params) > 0 ? '?'.http_build_query($params) : '';
             if ($type && $type !== '' && $type !== 'vocab' && !($localname === '' && $type === 'page')) {
-                return "$vocid/$lang/$type/$localname" . $paramstr;
+                return "$vocid/$lang/$type/$localname".$paramstr;
             }
 
-            return "$vocid/$lang/$localname" . $paramstr;
+            return "$vocid/$lang/$localname".$paramstr;
         }
 
         // case 2: URI outside vocabulary namespace, or has problematic chars
         // pass the full URI as parameter instead
         $params['uri'] = $uri;
-        return "$vocid/$lang/$type/?" . http_build_query($params);
+        return "$vocid/$lang/$type/?".http_build_query($params);
     }
 
     /**
@@ -187,7 +187,7 @@ 
     {
         if ($modifiedDate) {
             $ifModifiedSince = $this->getIfModifiedSince();
-            $this->sendHeader("Last-Modified: " . $modifiedDate->format('Y-m-d H:i:s'));
+            $this->sendHeader("Last-Modified: ".$modifiedDate->format('Y-m-d H:i:s'));
             if (!is_null($ifModifiedSince) && $ifModifiedSince >= $modifiedDate) {
                 $this->sendHeader("HTTP/1.0 304 Not Modified");
                 return true;

controller/WebController.php

Spacing +18 added lines, -18 removed lines

@@ -37,7 +37,7 @@ 
         // specify where to look for templates and cache
         $loader = new Twig_Loader_Filesystem('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));
         $this->twig->addExtension(new Twig_Extensions_Extension_I18n());
         // used for setting the base href for the relative urls
         $this->twig->addGlobal("BaseHref", $this->getBaseHref());
@@ -60,7 +60,7 @@ 
         $this->twig->addFilter(new Twig_SimpleFilter('link_url', array($this, 'linkUrlFilter')));
 
         // register a Twig filter for generating strings from language codes with CLDR
-        $langFilter = new Twig_SimpleFilter('lang_name', function ($langcode, $lang) {
+        $langFilter = new Twig_SimpleFilter('lang_name', function($langcode, $lang) {
             return Language::getName($langcode, $lang);
         });
         $this->twig->addFilter($langFilter);
@@ -272,9 +272,9 @@ 
     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 .= "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";
@@ -296,11 +296,11 @@ 
     {
         $toAddress = ($toMail) ? $toMail : $this->model->getConfig()->getFeedbackAddress();
         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();
-        $subject = $this->model->getConfig()->getServiceName() . " feedback";
+        $subject = $this->model->getConfig()->getServiceName()." feedback";
         // determine the sender address of the message
         $sender = $this->model->getConfig()->getFeedbackSender();
         if (empty($sender)) $sender = $envelopeSender;
@@ -313,10 +313,10 @@ 
         $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, $subject, $message, $headers, $params);
@@ -324,7 +324,7 @@ 
             header("HTTP/1.0 404 Not Found");
             $template = $this->twig->loadTemplate('error-page.twig');
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
-                error_log('Caught exception: ' . $e->getMessage());
+                error_log('Caught exception: '.$e->getMessage());
             }
 
             echo $template->render(
@@ -371,7 +371,7 @@ 
         $vocids = ($vocabs !== null && $vocabs !== '') ? explode(' ', $vocabs) : null;
         $vocabObjects = array();
         if ($vocids) {
-            foreach($vocids as $vocid) {
+            foreach ($vocids as $vocid) {
                 $vocabObjects[] = $this->model->getVocabulary($vocid);
             }
         }
@@ -382,7 +382,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());
             }
             $this->invokeGenericErrorPage($request, $e->getMessage());
             return;
@@ -398,7 +398,7 @@ 
                 'search_count' => $counts,
                 'languages' => $this->languages,
                 'search_results' => $searchResults,
-                'rest' => $parameters->getOffset()>0,
+                'rest' => $parameters->getOffset() > 0,
                 'global_search' => true,
                 'term' => $request->getQueryParamRaw('q'),
                 'lang_list' => $langList,
@@ -423,7 +423,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(
@@ -444,7 +444,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(
@@ -461,7 +461,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(),
@@ -590,7 +590,7 @@ 
      * Loads and renders the view containing a list of recent changes in the vocabulary.
      * @param Request $request
      */
-    public function invokeChangeList($request, $prop='dc:created')
+    public function invokeChangeList($request, $prop = 'dc:created')
     {
         // set language parameters for gettext
         $this->setLanguageProperties($request->getLang());