NatLibFi / Skosmos

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

controller/RestController.php

Spacing +6 added lines, -6 removed lines

@@ -43,7 +43,7 @@ 
         // wrap with JSONP callback if requested
         if (filter_input(INPUT_GET, 'callback', FILTER_SANITIZE_STRING)) {
             header("Content-type: application/javascript; charset=utf-8");
-            echo filter_input(INPUT_GET, 'callback', FILTER_UNSAFE_RAW) . "(" . json_encode($data) . ");";
+            echo filter_input(INPUT_GET, 'callback', FILTER_UNSAFE_RAW)."(".json_encode($data).");";
             return;
         }
         
@@ -122,7 +122,7 @@ 
         // convert to vocids array to support multi-vocabulary search
         $vocids = ($vocabs !== null && $vocabs !== '') ? explode(' ', $vocabs) : array();
         $vocabObjects = array();
-        foreach($vocids as $vocid) {
+        foreach ($vocids as $vocid) {
             $vocabObjects[] = $this->model->getVocabulary($vocid);
         }
         $parameters->setVocabularies($vocabObjects);
@@ -168,7 +168,7 @@ 
         if ($request->getQueryParam('labellang')) {
             $ret['@context']['@language'] = $request->getQueryParam('labellang');
         } elseif ($request->getQueryParam('lang')) {
-            $ret['@context']['@language'] = $request->getQueryParam('lang');;
+            $ret['@context']['@language'] = $request->getQueryParam('lang'); ;
         }
         return $ret;
     }
@@ -513,10 +513,10 @@ 
 
         $format = $this->negotiateFormat(array_keys($urls), $request->getServerConstant('HTTP_ACCEPT'), $request->getQueryParam('format'));
         if (!$format) {
-            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: " . implode(' ', array_keys($urls)));
+            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: ".implode(' ', array_keys($urls)));
         }
 
-        header("Location: " . $urls[$format]);
+        header("Location: ".$urls[$format]);
     }
     
     private function returnDataResults($results, $format) {
@@ -570,7 +570,7 @@ 
 
         $format = $this->negotiateFormat(explode(' ', self::SUPPORTED_FORMATS), $request->getServerConstant('HTTP_ACCEPT'), $request->getQueryParam('format'));
         if (!$format) {
-            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: " . self::SUPPORTED_FORMATS);
+            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: ".self::SUPPORTED_FORMATS);
         }
 
         $vocid = $vocab ? $vocab->getId() : null;

rest.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
     } elseif ($parts[1] == 'data') {
         $controller->data($request);
     } elseif (sizeof($parts) == 2) {
-        header("Location: " . $parts[1] . "/");
+        header("Location: ".$parts[1]."/");
     } else {
         $vocab = $parts[1];
         try {
@@ -93,5 +93,5 @@ 
     }
 } catch (Exception $e) {
     header("HTTP/1.0 500 Internal Server Error");
-    echo('ERROR: ' . $e->getMessage());
+    echo('ERROR: '.$e->getMessage());
 }

model/Concept.php

Spacing +11 added lines, -11 removed lines

@@ -118,12 +118,12 @@ 
         // 3. label in any language
         $label = $this->resource->label();
         // if the label lang code is a subset of the ui lang eg. en-GB
-        if ($label !== null && strpos($label->getLang(), $this->getEnvLang() . '-') === 0) {
+        if ($label !== null && strpos($label->getLang(), $this->getEnvLang().'-') === 0) {
             return $label->getValue();
         }
 
         if ($label !== null) {
-            return $label->getValue() . " (" . $label->getLang() . ")";
+            return $label->getValue()." (".$label->getLang().")";
         }
 
         // empty
@@ -448,14 +448,14 @@ 
 
             // making a human readable string from the timestamps
             if ($created != '') {
-                $ret = gettext('skosmos:created') . ' ' . (Punic\Calendar::formatDate($created, 'short'));
+                $ret = gettext('skosmos:created').' '.(Punic\Calendar::formatDate($created, 'short'));
             }
 
             if ($modified != '') {
                 if ($created != '') {
-                    $ret .= ', ' . gettext('skosmos:modified') . ' ' . (Punic\Calendar::formatDate($modified, 'short'));
+                    $ret .= ', '.gettext('skosmos:modified').' '.(Punic\Calendar::formatDate($modified, 'short'));
                 } else {
-                    $ret .= ' ' . ucfirst(gettext('skosmos:modified')) . ' ' . (Punic\Calendar::formatDate($modified, 'short'));
+                    $ret .= ' '.ucfirst(gettext('skosmos:modified')).' '.(Punic\Calendar::formatDate($modified, 'short'));
                 }
 
             }
@@ -463,12 +463,12 @@ 
             trigger_error($e->getMessage(), E_USER_WARNING);
             $ret = '';
             if ($this->resource->get('dc:modified')) {
-                $modified = (string) $this->resource->get('dc:modified');
-                $ret = gettext('skosmos:modified') . ' ' . $modified; 
+                $modified = (string)$this->resource->get('dc:modified');
+                $ret = gettext('skosmos:modified').' '.$modified; 
             }
             if ($this->resource->get('dc:created')) {
-                $created .= (string) $this->resource->get('dc:created');
-                $ret .= ' ' . gettext('skosmos:created') . ' ' . $created; 
+                $created .= (string)$this->resource->get('dc:created');
+                $ret .= ' '.gettext('skosmos:created').' '.$created; 
             }
         }
         return $ret;
@@ -555,7 +555,7 @@ 
         $labels = array();
         foreach ($this->resource->allLiterals('skos:prefLabel') as $lit) {
             // filtering away subsets of the current language eg. en vs en-GB
-            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang() . '-') !== 0) {
+            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang().'-') !== 0) {
                 $langName = Punic\Language::getName($lit->getLang(), $this->getEnvLang()) !== $lit->getLang() ? Punic\Language::getName($lit->getLang(), $this->getEnvLang()) : gettext($lit->getLang());
                 $labels[$langName][] = new ConceptPropertyValueLiteral($lit, 'skos:prefLabel');
             }
@@ -563,7 +563,7 @@ 
         }
         foreach ($this->resource->allLiterals('skos:altLabel') as $lit) {
             // filtering away subsets of the current language eg. en vs en-GB
-            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang() . '-') !== 0) {
+            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang().'-') !== 0) {
                 $langName = Punic\Language::getName($lit->getLang(), $this->getEnvLang()) ? Punic\Language::getName($lit->getLang(), $this->getEnvLang()) : gettext($lit->getLang());
                 $labels[$langName][] = new ConceptPropertyValueLiteral($lit, 'skos:altLabel');
             }

model/Request.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 
     public function getRequestUri()
     {
-        return $this->getServerConstant('HTTP_HOST') . $this->getServerConstant('REQUEST_URI');
+        return $this->getServerConstant('HTTP_HOST').$this->getServerConstant('REQUEST_URI');
     }
     
     /**

model/Model.php

Spacing +7 added lines, -7 removed lines

@@ -65,15 +65,15 @@ 
     private function initializeVocabularies()
     {
         if (!file_exists($this->getConfig()->getVocabularyConfigFile())) {
-            throw new Exception($this->getConfig()->getVocabularyConfigFile() . ' is missing, please provide one.');
+            throw new Exception($this->getConfig()->getVocabularyConfigFile().' is missing, please provide one.');
         }
 
         try {
             // use APC user cache to store parsed vocabularies.ttl configuration
             if (function_exists('apc_store') && function_exists('apc_fetch')) {
                 // @codeCoverageIgnoreStart
-                $key = realpath($this->getConfig()->getVocabularyConfigFile()) . ", " . filemtime($this->getConfig()->getVocabularyConfigFile());
-                $nskey = "namespaces of " . $key;
+                $key = realpath($this->getConfig()->getVocabularyConfigFile()).", ".filemtime($this->getConfig()->getVocabularyConfigFile());
+                $nskey = "namespaces of ".$key;
                 $this->graph = apc_fetch($key);
                 $this->namespaces = apc_fetch($nskey);
                 if ($this->graph === false || $this->namespaces === false) { // was not found in cache
@@ -86,7 +86,7 @@ 
                 $this->parseVocabularies($this->getConfig()->getVocabularyConfigFile());
             }
         } catch (Exception $e) {
-            echo "Error: " . $e->getMessage();
+            echo "Error: ".$e->getMessage();
         }
     }
 
@@ -424,7 +424,7 @@ 
     public function getVocabularyCategories()
     {
         $cats = $this->graph->allOfType('skos:Concept');
-        if(empty($cats)) {
+        if (empty($cats)) {
             return array(new VocabularyCategory($this, null));
         }
 
@@ -571,7 +571,7 @@ 
         // using apc cache for the resource if available
         if (function_exists('apc_store') && function_exists('apc_fetch')) {
             // @codeCoverageIgnoreStart
-            $key = 'fetch: ' . EasyRdf_Utils::removeFragmentFromUri($uri);
+            $key = 'fetch: '.EasyRdf_Utils::removeFragmentFromUri($uri);
             $resource = apc_fetch($key);
             if ($resource === null || $resource === false) { // was not found in cache, or previous request failed
                 $resource = $this->fetchResourceFromUri($uri);
@@ -592,7 +592,7 @@ 
      */
     public function getSparqlImplementation($dialect, $endpoint, $graph)
     {
-        $classname = $dialect . "Sparql";
+        $classname = $dialect."Sparql";
 
         return new $classname($endpoint, $graph, $this);
     }

model/VocabularyConfig.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
 {
     private $plugins;
 
-    public function __construct($resource, $globalPlugins=array()) 
+    public function __construct($resource, $globalPlugins = array()) 
     {
         $this->resource = $resource;
         $plugins = $this->resource->allLiterals('skosmos:usePlugin');
@@ -40,7 +40,7 @@ 
      * @param string $property the property to query
      * @param string $lang preferred language for the literal,
      */
-    private function getLiteral($property, $lang=null)
+    private function getLiteral($property, $lang = null)
     {
         if (!isset($lang)) {;
             $lang = $this->getEnvLang();
@@ -72,7 +72,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;

model/ConceptProperty.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
      * @param string $prop property type eg. 'rdf:type'.
      * @param string $label
      */
-    public function __construct($prop, $label, $super=null)
+    public function __construct($prop, $label, $super = null)
     {
         $this->prop = $prop;
         $this->label = $label;
@@ -59,7 +59,7 @@ 
      */
     public function getDescription()
     {
-        $helpprop = $this->prop . "_help";
+        $helpprop = $this->prop."_help";
 
         return gettext($helpprop); // can't use string constant, it'd be picked up by xgettext
     }
@@ -78,7 +78,7 @@ 
 
     public function addValue($value)
     {
-        $this->values[$value->getLabel() . $value->getUri()] = $value;
+        $this->values[$value->getLabel().$value->getUri()] = $value;
         $this->is_sorted = false;
     }
 
@@ -86,7 +86,7 @@ 
     {
         if (!empty($this->values)) {
             uksort($this->values, function($a, $b) {
-                return strnatcasecmp($a,$b);
+                return strnatcasecmp($a, $b);
             });
         }
         $this->is_sorted = true;

model/ConceptPropertyValue.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     {
         $label = is_string($this->getLabel()) ? $this->getLabel() : $this->getLabel()->getValue();
         if ($this->vocab->getConfig()->sortByNotation()) {
-            $label = $this->getNotation() . $label;
+            $label = $this->getNotation().$label;
         }
 
         return $label;