NatLibFi / Skosmos

model/BaseConfig.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      * @param string $default default value
      * @param string $lang preferred language for the literal
      */
-    protected function getLiteral($property, $default=null, $lang=null)
+    protected function getLiteral($property, $default = null, $lang = null)
     {
         if (!isset($lang)) {;
             $lang = $this->getEnvLang();

Braces +3 added lines, -2 removed lines

@@ -55,8 +55,9 @@
 
         // not found with selected language, try any language
         $literal = $this->getResource()->getLiteral($property);
-        if ($literal)
-          return $literal->getValue();
+        if ($literal) {
+                  return $literal->getValue();
+        }
 
         return $default;
     }

Indentation +5 added lines, -5 removed lines

@@ -7,11 +7,11 @@
 abstract class BaseConfig extends DataObject
 {
 
-	/**
-     * Returns a boolean value based on a literal value from the config.ttl configuration.
-     * @param string $property the property to query
-     * @param boolean $default the default value if the value is not set in configuration
-     */
+  /**
+   * Returns a boolean value based on a literal value from the config.ttl configuration.
+   * @param string $property the property to query
+   * @param boolean $default the default value if the value is not set in configuration
+   */
     protected function getBoolean($property, $default = false)
     {
         $val = $this->getResource()->getLiteral($property);

model/VocabularyConfig.php

Braces +15 added lines, -7 removed lines

@@ -58,8 +58,9 @@ 
     public function getShortName()
     {
         $shortname = $this->getLiteral('skosmos:shortName');
-        if ($shortname)
-          return $shortname;
+        if ($shortname) {
+                  return $shortname;
+        }
 
         // if no shortname exists fall back to the id
         return $this->getId();
@@ -194,10 +195,12 @@ 
         $ret = array();
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf\RdfNamespace::shorten($prop) !== null) // shortening property labels if possible
+            if (EasyRdf\RdfNamespace::shorten($prop) !== null) {
+              // shortening property labels if possible
             {
                 $prop = EasyRdf\RdfNamespace::shorten($prop);
             }
+            }
 
             $ret[] = $prop;
         }
@@ -214,10 +217,12 @@ 
         $resources = $this->resource->allResources("skosmos:hasMultiLingualProperty");
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf\RdfNamespace::shorten($prop) !== null) // shortening property labels if possible
+            if (EasyRdf\RdfNamespace::shorten($prop) !== null) {
+              // shortening property labels if possible
             {
                 $prop = EasyRdf\RdfNamespace::shorten($prop);
             }
+            }
 
             if ($prop === $property) {
                 return true;
@@ -329,11 +334,12 @@ 
     public function getId()
     {
         $uriparts = explode("#", $this->resource->getURI());
-        if (count($uriparts) != 1)
-        // hash namespace
+        if (count($uriparts) != 1) {
+                // hash namespace
         {
             return $uriparts[1];
         }
+        }
 
         // slash namespace
         $uriparts = explode("/", $this->resource->getURI());
@@ -361,10 +367,12 @@ 
         $ret = array();
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf\RdfNamespace::shorten($prop) !== null) // prefixing if possible
+            if (EasyRdf\RdfNamespace::shorten($prop) !== null) {
+              // prefixing if possible
             {
                 $prop = EasyRdf\RdfNamespace::shorten($prop);
             }
+            }
 
             $ret[] = $prop;
         }

Doc Comments +4 added lines, -2 removed lines

@@ -266,6 +266,7 @@ 
 
     /**
      * Returns skosmos:marcSourcecode value set in config.ttl.
+     * @param string $lang
      * @return string marcsource name
      */
     public function getMarcSourceCode($lang = null)
@@ -275,7 +276,7 @@ 
 
     /**
      * Returns a boolean value set in the config.ttl config.
-     * @return array array of concept class URIs (can be empty)
+     * @return string[] array of concept class URIs (can be empty)
      */
     public function getIndexClasses()
     {
@@ -284,7 +285,7 @@ 
 
     /**
      * Returns skosmos:externalProperty values set in the config.ttl config.
-     * @return array array of external property URIs (can be empty)
+     * @return string[] array of external property URIs (can be empty)
      */
     public function getExtProperties()
     {
@@ -410,6 +411,7 @@ 
 
     /**
      * Returns the vocabulary dc:type value(s) with their labels and uris, if set in the vocabulary configuration.
+     * @param string $lang
      * @return array of objects or an empty array
      */
     public function getTypes($lang = null)

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
     private $plugins;
     private $languageOrderCache = array();
 
-    public function __construct($resource, $globalPlugins=array())
+    public function __construct($resource, $globalPlugins = array())
     {
         $this->resource = $resource;
         $plugins = $this->resource->allLiterals('skosmos:usePlugin');
@@ -36,7 +36,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;

migrate-config.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
     foreach (explode(' ', GLOBAL_PLUGINS) as $pluginName) {
         $globalPluginsArray[] = "\"$pluginName\"";
     }
-    $globalPlugins = " " . implode(', ', $globalPluginsArray) . " ";
+    $globalPlugins = " ".implode(', ', $globalPluginsArray)." ";
 }
 
 # print the prefixes

controller/EntityController.php

Indentation +4 added lines, -4 removed lines

@@ -30,14 +30,14 @@
             $url = $baseurl . "$vocid/";
         } else {
 
-   	        if ($localname !== $uri && $localname === urlencode($localname)) {
-   	        // the URI can be shortened
+              if ($localname !== $uri && $localname === urlencode($localname)) {
+              // the URI can be shortened
             $url = $baseurl . "$vocid/page/$localname";
             } else {
                 // must use full URI
-   	            $query = http_build_query(array('uri'=>$uri));
+                  $query = http_build_query(array('uri'=>$uri));
                 $url = $baseurl . "$vocid/page/?" . $query;
-	        }
+          }
         }
         $this->redirect303($url);
     }

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
         $baseurl = $this->getBaseHref();
         $vocid = $vocab->getId();
         $query = http_build_query(array('uri'=>$uri, 'format'=>$targetFormat));
-        $url = $baseurl . "rest/v1/$vocid/data?$query";
+        $url = $baseurl."rest/v1/$vocid/data?$query";
         $this->redirect303($url);
     }
 
@@ -27,16 +27,16 @@ 
         $localname = $vocab->getLocalName($uri);
 
         if (!$localname) {
-            $url = $baseurl . "$vocid/";
+            $url = $baseurl."$vocid/";
         } else {
 
    	        if ($localname !== $uri && $localname === urlencode($localname)) {
    	        // the URI can be shortened
-            $url = $baseurl . "$vocid/page/$localname";
+            $url = $baseurl."$vocid/page/$localname";
             } else {
                 // must use full URI
    	            $query = http_build_query(array('uri'=>$uri));
-                $url = $baseurl . "$vocid/page/?" . $query;
+                $url = $baseurl."$vocid/page/?".$query;
 	        }
         }
         $this->redirect303($url);
@@ -57,7 +57,7 @@ 
             // guess vocabulary based on URI
             $vocab = $this->model->guessVocabularyFromURI($request->getUri());
             if ($vocab === null) {
-                return $this->returnError('404', 'Not Found', 'Unrecognized URI ' . $request->getUri());
+                return $this->returnError('404', 'Not Found', 'Unrecognized URI '.$request->getUri());
             }
             $request->setVocab($vocab->getId());
         }

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 ltrim($notation . ' ') . $label;
+        return ltrim($notation.' ').$label;
     }
 
     public function getType()
@@ -187,42 +187,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($lang, $queryExVocabs);

model/ConceptPropertyValue.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
     {
         $label = is_string($this->getLabel()) ? $this->getLabel() : $this->getLabel()->getValue();
         if ($this->vocab->getConfig()->sortByNotation()) {
-            $label = ltrim($this->getNotation() . ' ') . $label;
+            $label = ltrim($this->getNotation().' ').$label;
         }
 
         return $label;
@@ -47,9 +47,9 @@ 
                 }
                 // We need to check all the labels in case one of them matches a subtag of the current language
                 if ($this->resource->allLiterals('skos:prefLabel')) {
-                    foreach($this->resource->allLiterals('skos:prefLabel') as $label) {
+                    foreach ($this->resource->allLiterals('skos:prefLabel') as $label) {
                         // the label lang code is a subtag of the UI lang eg. en-GB - create a new literal with the main language
-                        if ($label !== null && strpos($label->getLang(), $fallback . '-') === 0) {
+                        if ($label !== null && strpos($label->getLang(), $fallback.'-') === 0) {
                             return EasyRdf\Literal::create($label, $fallback);
                         }
                     }
@@ -141,7 +141,7 @@ 
     public function getReifiedPropertyValues() {
         $ret = array();
         $props = $this->resource->propertyUris();
-        foreach($props as $prop) {
+        foreach ($props as $prop) {
             $prop = (EasyRdf\RdfNamespace::shorten($prop) !== null) ? EasyRdf\RdfNamespace::shorten($prop) : $prop;
             foreach ($this->resource->allLiterals($prop) as $val) {
                 if ($prop !== 'rdf:value') { // shown elsewhere

model/ConceptProperty.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
      * @param string $prop property type eg. 'rdf:type'.
      * @param string $label
      */
-    public function __construct($prop, $label, $super=null, $sort_by_notation=false)
+    public function __construct($prop, $label, $super = null, $sort_by_notation = false)
     {
         $this->prop = $prop;
         $this->label = $label;
@@ -61,7 +61,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
     }
@@ -80,7 +80,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;
     }
 
@@ -88,7 +88,7 @@ 
     {
         if (!empty($this->values)) {
             uksort($this->values, function($a, $b) {
-                return $this->sort_by_notation ? strnatcasecmp($a, $b) : strcoll(strtolower($a),strtolower($b));
+                return $this->sort_by_notation ? strnatcasecmp($a, $b) : strcoll(strtolower($a), strtolower($b));
             });
         }
         $this->is_sorted = true;

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 = count($params) > 0 ? '?' . http_build_query($params) : '';
+            $paramstr = count($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;

model/resolver/LOCResource.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
             $opts = array('http' => array('method'=>'HEAD',
                                           'user_agent' => 'Skosmos',
                                           'timeout' => $timeout));
-            $context  = stream_context_create($opts);
+            $context = stream_context_create($opts);
             $fd = fopen($this->uri, 'rb', false, $context);
             $headers = stream_get_meta_data($fd)['wrapper_data'];
             foreach ($headers as $header) {