NatLibFi / Skosmos

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

entity.php

Spacing +1 added lines, -1 removed lines

@@ -23,5 +23,5 @@
 
 } catch (Exception $e) {
     header("HTTP/1.0 500 Internal Server Error");
-    echo('ERROR: ' . $e->getMessage());
+    echo('ERROR: '.$e->getMessage());
 }

model/DataObject.php

Braces +3 added lines, -1 removed lines

@@ -79,10 +79,12 @@
         if ($sortable !== null) {
             uksort($sortable, array($this, 'mycompare'));
             foreach ($sortable as $prop => $vals) {
-                if (is_array($prop)) // the ConceptProperty objects have their own sorting methods
+                if (is_array($prop)) {
+                  // the ConceptProperty objects have their own sorting methods
                 {
                     ksort($sortable[$prop]);
                 }
+                }
             }
         }
         return $sortable;

Indentation +2 added lines, -2 removed lines

@@ -124,8 +124,8 @@
      */
     public function getEnvLang()
     {
-       // get language from locale, same as used by gettext, set by Controller
-       return substr(getenv("LC_ALL"), 0, 2); // @codeCoverageIgnore
+        // get language from locale, same as used by gettext, set by Controller
+        return substr(getenv("LC_ALL"), 0, 2); // @codeCoverageIgnore
     }
 
     /**

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
                 return isset($results[$lang]) ? $results[$lang] : null;
             } 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());
                 }
             }
         }
@@ -74,7 +74,7 @@ 
                 return isset($results) ? $results : null;
             } 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());
                 }
             }
         }

controller/RestController.php

Braces +18 added lines, -6 removed lines

@@ -400,7 +400,9 @@ 
                 $hits[] = $res;
             }
         }
-        if (sizeof($hits) > 0) return $hits;
+        if (sizeof($hits) > 0) {
+          return $hits;
+        }
 
         // case 2: case-insensitive match on preferred label
         foreach ($results as $res) {
@@ -408,7 +410,9 @@ 
                 $hits[] = $res;
             }
         }
-        if (sizeof($hits) > 0) return $hits;
+        if (sizeof($hits) > 0) {
+          return $hits;
+        }
 
         if ($lang === null) {
             // case 1A: exact match on preferred label in any language
@@ -419,7 +423,9 @@ 
                     $hits[] = $res;
                 }
             }
-            if (sizeof($hits) > 0) return $hits;
+            if (sizeof($hits) > 0) {
+              return $hits;
+            }
 
             // case 2A: case-insensitive match on preferred label in any language
             foreach ($results as $res) {
@@ -429,7 +435,9 @@ 
                     $hits[] = $res;
                 }
             }
-            if (sizeof($hits) > 0) return $hits;
+            if (sizeof($hits) > 0) {
+              return $hits;
+            }
         }
 
         // case 3: exact match on alternate label
@@ -438,7 +446,9 @@ 
                 $hits[] = $res;
             }
         }
-        if (sizeof($hits) > 0) return $hits;
+        if (sizeof($hits) > 0) {
+          return $hits;
+        }
 
 
         // case 4: case-insensitive match on alternate label
@@ -447,7 +457,9 @@ 
                 $hits[] = $res;
             }
         }
-        if (sizeof($hits) > 0) return $hits;
+        if (sizeof($hits) > 0) {
+          return $hits;
+        }
 
         return $hits;
     }

Indentation +5 added lines, -5 removed lines

@@ -575,9 +575,9 @@ 
                 $vocid = $request->getVocab()->getId();
                 return $this->returnError('404', 'Not Found', "No download source URL known for vocabulary $vocid in language $dataLang");
             }
-		} else {
+    } else {
             header("Location: " . $urls[$format]);
-		}
+    }
     }
 
     private function returnDataResults($results, $format) {
@@ -1120,9 +1120,9 @@ 
         }
         return $this->returnJson(array_merge_recursive($this->context,
                                                         array('@context' => array( '@language' => $request->getLang(),
-                                                                                     'prefLabel' => 'skos:prefLabel',
-                                                                                     'xsd' => 'http://www.w3.org/2001/XMLSchema#',
-                                                                                     'date' => array( '@id' => 'http://purl.org/dc/terms/date', '@type' => 'http://www.w3.org/2001/XMLSchema#dateTime') )
+                                                                                      'prefLabel' => 'skos:prefLabel',
+                                                                                      'xsd' => 'http://www.w3.org/2001/XMLSchema#',
+                                                                                      'date' => array( '@id' => 'http://purl.org/dc/terms/date', '@type' => 'http://www.w3.org/2001/XMLSchema#dateTime') )
                                                         ),
                                                         array('changeList' => $simpleChangeList)));
 

Spacing +19 added lines, -19 removed lines

@@ -25,7 +25,7 @@ 
         // wrap with JSONP callback if requested
         if (filter_input(INPUT_GET, 'callback', FILTER_SANITIZE_FULL_SPECIAL_CHARS)) {
             header("Content-type: application/javascript; charset=utf-8");
-            echo filter_input(INPUT_GET, 'callback', FILTER_SANITIZE_FULL_SPECIAL_CHARS) . "(" . json_encode($data) . ");";
+            echo filter_input(INPUT_GET, 'callback', FILTER_SANITIZE_FULL_SPECIAL_CHARS)."(".json_encode($data).");";
             return;
         }
 
@@ -88,7 +88,7 @@ 
                 'vocabularies' => 'onki:hasVocabulary',
                 'id' => 'onki:vocabularyIdentifier',
                 'uri' => '@id',
-                '@base' => $this->getBaseHref() . "rest/v1/vocabularies",
+                '@base' => $this->getBaseHref()."rest/v1/vocabularies",
             ),
             'uri' => '',
             'vocabularies' => $results,
@@ -105,7 +105,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);
@@ -136,12 +136,12 @@ 
         foreach ($parameters->getAdditionalFields() as $field) {
 
             // Quick-and-dirty compactification
-            $context[$field] = 'skos:' . $field;
+            $context[$field] = 'skos:'.$field;
             foreach ($results as &$result) {
                 foreach ($result as $k => $v) {
-                    if ($k == 'skos:' . $field) {
+                    if ($k == 'skos:'.$field) {
                         $result[$field] = $v;
-                        unset($result['skos:' . $field]);
+                        unset($result['skos:'.$field]);
                     }
                 }
             }
@@ -232,7 +232,7 @@ 
                 'prefLabel' => 'skos:prefLabel',
                 'title' => 'dct:title',
                 '@language' => $request->getLang(),
-                '@base' => $this->getBaseHref() . "rest/v1/" . $vocab->getId() . "/",
+                '@base' => $this->getBaseHref()."rest/v1/".$vocab->getId()."/",
             ),
             'uri' => '',
             'id' => $vocab->getId(),
@@ -287,7 +287,7 @@ 
                 'subTypes' => array('@id' => 'void:class', '@type' => '@id'),
                 'count' => 'void:entities',
                 '@language' => $request->getLang(),
-                '@base' => $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/",
+                '@base' => $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/",
             ),
             'uri' => '',
             'id' => $request->getVocab()->getId(),
@@ -369,7 +369,7 @@ 
                 'language' => 'void-ext:language',
                 'properties' => 'void:propertyPartition',
                 'labels' => 'void:triples',
-                '@base' => $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/",
+                '@base' => $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/",
             ),
             'uri' => '',
             'id' => $request->getVocab()->getId(),
@@ -410,7 +410,7 @@ 
             $types[] = $type;
         }
 
-        $base = $request->getVocab() ? $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/" : $this->getBaseHref() . "rest/v1/";
+        $base = $request->getVocab() ? $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/" : $this->getBaseHref()."rest/v1/";
 
         $ret = array_merge_recursive($this->context, array(
             '@context' => array(
@@ -451,7 +451,7 @@ 
         if ($lang === null) {
             // case 1A: exact match on preferred label in any language
             foreach ($results as $res) {
-                if (isset($res['matchedPrefLabel']) && $res['matchedPrefLabel']  == $label) {
+                if (isset($res['matchedPrefLabel']) && $res['matchedPrefLabel'] == $label) {
                     $res['prefLabel'] = $res['matchedPrefLabel'];
                     unset($res['matchedPrefLabel']);
                     $hits[] = $res;
@@ -573,19 +573,19 @@ 
 
         $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)));
         }
         if (is_array($urls[$format])) {
             $arr = $urls[$format];
             $dataLang = $request->getLang();
             if (isset($arr[$dataLang])) {
-                header("Location: " . $arr[$dataLang]);
+                header("Location: ".$arr[$dataLang]);
             } else {
                 $vocid = $request->getVocab()->getId();
                 return $this->returnError('404', 'Not Found', "No download source URL known for vocabulary $vocid in language $dataLang");
             }
 		} else {
-            header("Location: " . $urls[$format]);
+            header("Location: ".$urls[$format]);
 		}
     }
 
@@ -648,7 +648,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;
@@ -933,7 +933,7 @@ 
                         }
                     }
                     // if the main concept scheme was not found, set 'top' to the first 'tops' (sorted alphabetically on the URIs)
-                    if (! isset($results[$uri]['top'])) {
+                    if (!isset($results[$uri]['top'])) {
                         $results[$uri]['top'] = $results[$uri]['tops'][0];
                     }
                 } else {
@@ -1111,7 +1111,7 @@ 
         $changeList = $request->getVocab()->getChangeList($prop, $request->getLang(), $offset, $limit);
 
         $simpleChangeList = array();
-        foreach($changeList as $conceptInfo) {
+        foreach ($changeList as $conceptInfo) {
             if (array_key_exists('date', $conceptInfo)) {
                 $concept = array(
                     'uri' => $conceptInfo['uri'],
@@ -1127,10 +1127,10 @@ 
             }
         }
         return $this->returnJson(array_merge_recursive($this->context,
-                                                        array('@context' => array( '@language' => $request->getLang(),
+                                                        array('@context' => array('@language' => $request->getLang(),
                                                                                      'prefLabel' => 'skos:prefLabel',
                                                                                      'xsd' => 'http://www.w3.org/2001/XMLSchema#',
-                                                                                     'date' => array( '@id' => 'http://purl.org/dc/terms/date', '@type' => 'http://www.w3.org/2001/XMLSchema#dateTime') )
+                                                                                     'date' => array('@id' => 'http://purl.org/dc/terms/date', '@type' => 'http://www.w3.org/2001/XMLSchema#dateTime'))
                                                         ),
                                                         array('changeList' => $simpleChangeList)));
 

model/PluginRegister.php

Braces +1 added lines, -2 removed lines

@@ -40,8 +40,7 @@
                     $ret[$name] = array();
                     if ($raw) {
                         $ret[$name] = $files[$type];
-                    }
-                    else {
+                    } else {
                         foreach ($files[$type] as $file) {
                             array_push($ret[$name], 'plugins/' . $name . '/' . $file);
                         }

Spacing +10 added lines, -10 removed lines

@@ -3,7 +3,7 @@ 
 class PluginRegister {
     private $requestedPlugins;
 
-    public function __construct($requestedPlugins=array()) {
+    public function __construct($requestedPlugins = array()) {
         $this->requestedPlugins = $requestedPlugins;
         $this->pluginOrder = array();
         foreach ($this->requestedPlugins as $index => $value) {
@@ -45,7 +45,7 @@ 
      * @param boolean $raw interpret $type values as raw text instead of files
      * @return array
      */
-    private function filterPlugins($type, $raw=false) {
+    private function filterPlugins($type, $raw = false) {
         $plugins = $this->getPlugins();
         $plugins = $this->sortPlugins($plugins);
         $ret = array();
@@ -58,7 +58,7 @@ 
                     }
                     else {
                         foreach ($files[$type] as $file) {
-                            array_push($ret[$name], 'plugins/' . $name . '/' . $file);
+                            array_push($ret[$name], 'plugins/'.$name.'/'.$file);
                         }
                     }
                 }
@@ -89,7 +89,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getPluginsJS($names=null) {
+    public function getPluginsJS($names = null) {
         if ($names) {
             $names = array_merge($this->requestedPlugins, $names);
             return $this->filterPluginsByName('js', $names);
@@ -102,7 +102,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getPluginsCSS($names=null) {
+    public function getPluginsCSS($names = null) {
         if ($names) {
             $names = array_merge($this->requestedPlugins, $names);
             return $this->filterPluginsByName('css', $names);
@@ -115,7 +115,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getPluginsTemplates($names=null) {
+    public function getPluginsTemplates($names = null) {
         if ($names) {
             $names = array_merge($this->requestedPlugins, $names);
             return $this->filterPluginsByName('templates', $names);
@@ -128,15 +128,15 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getTemplates($names=null) {
+    public function getTemplates($names = null) {
         $templateStrings = array();
         $plugins = $this->getPluginsTemplates($names);
         foreach ($plugins as $folder => $templates) {
             foreach ($templates as $path) {
                 if (file_exists($path)) {
                     $filename = explode('/', $path);
-                    $filename = $filename[sizeof($filename)-1];
-                    $id = $folder . '-' . substr($filename, 0 , (strrpos($filename, ".")));
+                    $filename = $filename[sizeof($filename) - 1];
+                    $id = $folder.'-'.substr($filename, 0, (strrpos($filename, ".")));
                     $templateStrings[$id] = file_get_contents($path);
                 }
             }
@@ -149,7 +149,7 @@ 
      * @param array $names the plugin name strings (foldernames) in an array
      * @return array
      */
-    public function getPluginCallbacks($names=null) {
+    public function getPluginCallbacks($names = null) {
         if ($names) {
             $names = array_merge($this->requestedPlugins, $names);
             return $this->filterPluginsByName('callback', $names);

model/Cache.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     /**
      * Wraps apc_store() and apcu_store()
      */
-    public function store($key, $value, $ttl=3600) {
+    public function store($key, $value, $ttl = 3600) {
         if (function_exists('apcu_store')) {
             return apcu_store($key, $value, $ttl);
         }

model/GlobalConfig.php

Braces +3 added lines, -1 removed lines

@@ -109,10 +109,12 @@
      */
     private function initializeNamespaces() {
         foreach ($this->namespaces as $prefix => $fullUri) {
-            if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) // if not already defined
+            if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) {
+              // if not already defined
             {
                 EasyRdf\RdfNamespace::set($prefix, $fullUri);
             }
+            }
         }
     }
 

Spacing +7 added lines, -7 removed lines

@@ -28,17 +28,17 @@ 
      */
     private $configModifiedTime = null;
 
-    public function __construct($config_name='/../config.ttl')
+    public function __construct($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.');
             }
             $this->initializeConfig();
         } catch (Exception $e) {
-            echo "Error: " . $e->getMessage();
+            echo "Error: ".$e->getMessage();
             return;
         }
     }
@@ -72,8 +72,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
@@ -94,7 +94,7 @@ 
             $this->resource = $configResources[0];
             $this->initializeNamespaces();
         } catch (Exception $e) {
-            echo "Error: " . $e->getMessage();
+            echo "Error: ".$e->getMessage();
         }      
     }
 
@@ -324,7 +324,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();

model/BaseConfig.php

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 +6 added lines, -6 removed lines

@@ -7,12 +7,12 @@
 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
-     * @return boolean the boolean value for the given property, or the default value if not found
-     */
+  /**
+   * 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
+   * @return boolean the boolean value for the given property, or the default value if not found
+   */
     protected function getBoolean($property, $default = false)
     {
         $val = $this->getResource()->getLiteral($property);

Spacing +1 added lines, -1 removed lines

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

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