NatLibFi / Skosmos

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

Braces +9 added lines, -4 removed lines

@@ -109,10 +109,12 @@ 
     
     private function initializeNamespaces() {
         foreach ($this->namespaces as $prefix => $fullUri) {
-            if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) // if not already defined
+            if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) {
+              // if not already defined
             {
                 EasyRdf_Namespace::set($prefix, $fullUri);
             }
+            }
         }
     }
 
@@ -391,10 +393,12 @@ 
                 // register vocabulary ids as RDF namespace prefixes
                 $prefix = preg_replace('/\W+/', '', $voc->getId()); // strip non-word characters
                 try {
-                    if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) // if not already defined
+                    if ($prefix != '' && EasyRdf_Namespace::get($prefix) === null) {
+                      // if not already defined
                     {
                         EasyRdf_Namespace::set($prefix, $voc->getUriSpace());
                     }
+                    }
 
                 } catch (Exception $e) {
                     // not valid as namespace identifier, ignore
@@ -506,8 +510,9 @@ 
         }
         
         foreach ($vocabs as $vocab) {
-            if ($vocab->getConceptLabel($uri, null) !== null)
-                return $vocab;
+            if ($vocab->getConceptLabel($uri, null) !== null) {
+                            return $vocab;
+            }
         }
 
         // if the URI couldn't be found, fall back to the first vocabulary

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;

Braces +18 added lines, -9 removed lines

@@ -53,8 +53,9 @@ 
 
         // not found with selected language, try any language
         $literal = $this->resource->getLiteral($property);
-        if ($literal)
-          return $literal->getValue();
+        if ($literal) {
+                  return $literal->getValue();
+        }
     }
 
     /**
@@ -95,8 +96,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();
@@ -215,10 +217,12 @@ 
         $ret = array();
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf_Namespace::shorten($prop) !== null) // shortening property labels if possible
+            if (EasyRdf_Namespace::shorten($prop) !== null) {
+              // shortening property labels if possible
             {
                 $prop = EasyRdf_Namespace::shorten($prop);
             }
+            }
 
             $ret[] = $prop;
         }
@@ -235,10 +239,12 @@ 
         $resources = $this->resource->allResources("skosmos:hasMultiLingualProperty");
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf_Namespace::shorten($prop) !== null) // shortening property labels if possible
+            if (EasyRdf_Namespace::shorten($prop) !== null) {
+              // shortening property labels if possible
             {
                 $prop = EasyRdf_Namespace::shorten($prop);
             }
+            }
 
             if ($prop === $property) {
                 return true;
@@ -339,11 +345,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());
@@ -371,10 +378,12 @@ 
         $ret = array();
         foreach ($resources as $res) {
             $prop = $res->getURI();
-            if (EasyRdf_Namespace::shorten($prop) !== null) // prefixing if possible 
+            if (EasyRdf_Namespace::shorten($prop) !== null) {
+              // prefixing if possible 
             {
                 $prop = EasyRdf_Namespace::shorten($prop);
             }
+            }
 
             $ret[] = $prop;
         }

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;

model/PluginRegister.php

Spacing +8 added lines, -8 removed lines

@@ -3,7 +3,7 @@ 
 class PluginRegister {
     private $requestedPlugins;
 
-    public function __construct($requestedPlugins=array()) {
+    public function __construct($requestedPlugins = array()) {
         $this->requestedPlugins = $requestedPlugins;
     }
     
@@ -38,7 +38,7 @@ 
                 if (isset($files[$type])) {
                     $ret[$name] = array();
                     foreach ($files[$type] as $file) {
-                        array_push($ret[$name], 'plugins/' . $name . '/' . $file);
+                        array_push($ret[$name], 'plugins/'.$name.'/'.$file);
                     }
                 }
             } 
@@ -68,7 +68,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);
@@ -81,7 +81,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);
@@ -94,7 +94,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);
@@ -107,15 +107,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);
                 }
             }

model/ConceptMappingPropertyValue.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     {
         $label = $this->getLabel();
         $notation = $this->getNotation();
-        return $notation . $label;
+        return $notation.$label;
     }
 
     public function getType()

controller/EntityController.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,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);
     }
     
@@ -32,11 +32,11 @@ 
         $localname = $vocab->getLocalName($uri);
         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);
     }
@@ -56,7 +56,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());
         }

controller/WebController.php

Spacing +24 added lines, -24 removed lines

@@ -69,7 +69,7 @@ 
 
         // register a Twig filter for generating URLs for vocabulary resources (concepts and groups)
         $controller = $this; // for use by anonymous function below
-        $urlFilter = new Twig_SimpleFilter('link_url', function ($uri, $vocab, $lang, $type = 'page', $clang = null, $term = null) use ($controller) {
+        $urlFilter = new Twig_SimpleFilter('link_url', function($uri, $vocab, $lang, $type = 'page', $clang = null, $term = null) use ($controller) {
             // $vocab can either be null, a vocabulary id (string) or a Vocabulary object
             if ($vocab === null) {
                 // target vocabulary is unknown, best bet is to link to the plain URI
@@ -94,23 +94,23 @@ 
             $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') {
-                    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);
         });
         $this->twig->addFilter($urlFilter);
 
         // 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);
@@ -251,12 +251,12 @@ 
     private function createFeedbackHeaders($fromName, $fromEmail, $toMail)
     {
         $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 ($toMail) {
-            $headers .= "Cc: " . $this->model->getConfig()->getFeedbackAddress() . "\r\n";
+            $headers .= "Cc: ".$this->model->getConfig()->getFeedbackAddress()."\r\n";
         }
 
-        $headers .= "From: $fromName <$fromEmail>" . "\r\n" . 'X-Mailer: PHP/' . phpversion();
+        $headers .= "From: $fromName <$fromEmail>"."\r\n".'X-Mailer: PHP/'.phpversion();
         return $headers;
     }
 
@@ -271,20 +271,20 @@ 
     {
         $toAddress = ($toMail) ? $toMail : $this->model->getConfig()->getFeedbackAddress();
         if ($fromVocab !== null) {
-            $message = 'Feedback from vocab: ' . strtoupper($fromVocab) . "<br />" . $message;
+            $message = 'Feedback from vocab: '.strtoupper($fromVocab)."<br />".$message;
         }
 
-        $subject = SERVICE_NAME . " feedback";
+        $subject = SERVICE_NAME." feedback";
         $headers = $this->createFeedbackHeaders($fromName, $fromEmail, $toMail);
         $envelopeSender = FEEDBACK_ENVELOPE_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 />IP address: " . $request->getServerConstant('REMOTE_ADDR')
-            . "<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 />IP address: ".$request->getServerConstant('REMOTE_ADDR')
+            . "<br />Referer: ".$request->getServerConstant('HTTP_REFERER');
 
         try {
             mail($toAddress, $subject, $message, $headers, $params);
@@ -292,7 +292,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(
@@ -339,7 +339,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);
             }
         }
@@ -350,7 +350,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;
@@ -366,7 +366,7 @@ 
                 'search_count' => $counts,
                 'languages' => $this->languages,
                 'search_results' => $search_results,
-                'rest' => $parameters->getOffset()>0,
+                'rest' => $parameters->getOffset() > 0,
                 'global_search' => true,
                 'term' => $request->getQueryParam('q'),
                 'lang_list' => $langList,
@@ -391,7 +391,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(
@@ -412,7 +412,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(
@@ -429,7 +429,7 @@ 
                 'vocab' => $vocab,
                 'search_results' => $search_results,
                 '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(),
@@ -554,7 +554,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());

model/sparql/GenericSparql.php

Braces +7 added lines, -4 removed lines

@@ -64,12 +64,16 @@ 
         $this->model = $model;
 
         // set graphClause so that it can be used by all queries
-        if ($this->isDefaultEndpoint()) // default endpoint; query any graph (and catch it in a variable)
+        if ($this->isDefaultEndpoint()) {
+          // default endpoint; query any graph (and catch it in a variable)
         {
             $this->graphClause = "GRAPH $graph";
-        } elseif ($graph) // query a specific graph
+        }
+        } elseif ($graph) {
+          // query a specific graph
         {
             $this->graphClause = "GRAPH <$graph>";
+        }
         } else // query the default graph
         {
             $this->graphClause = "";
@@ -1711,8 +1715,7 @@ 
         if (sizeof($ret) > 0) {
             // existing concept, with children
             return $ret;
-        }
-        else {
+        } else {
             // nonexistent concept
             return null;
         }

Doc Comments +3 added lines, -3 removed lines

@@ -393,7 +393,7 @@ 
      * Returns information (as a graph) for one or more concept URIs
      * @param mixed $uris concept URI (string) or array of URIs
      * @param string|null $arrayClass the URI for thesaurus array class, or null if not used
-     * @param \Vocabulary[]|null $vocabs vocabularies to target
+     * @param Vocabulary[] $vocabs vocabularies to target
      * @return \Concept[]
      */
     public function queryConceptInfoGraph($uris, $arrayClass = null, $vocabs = array()) {
@@ -619,7 +619,7 @@ 
 
     /**
      * Generate a VALUES clause for limiting the targeted graphs.
-     * @param Vocabulary[]|null $vocabs array of Vocabulary objects to target
+     * @param Vocabulary[] $vocabs array of Vocabulary objects to target
      * @return string VALUES clause, or "" if not necessary to limit
      */
     protected function formatValuesGraph($vocabs) {
@@ -1349,7 +1349,7 @@ 
     /**
      * Query a single transitive property of a concept.
      * @param string $uri
-     * @param string $prop the name of the property eg. 'skos:broader'.
+     * @param string $props the name of the property eg. 'skos:broader'.
      * @param string $lang
      * @param integer $limit
      * @param boolean $anylang if you want a label even when it isn't available in the language you requested.

Spacing +21 added lines, -21 removed lines

@@ -648,7 +648,7 @@ 
         foreach ($graphs as $graph) {
           $conditions[] = "?graph=<$graph>";
         }
-        return "FILTER (" . implode('||', $conditions) . ")";
+        return "FILTER (".implode('||', $conditions).")";
     }
 
     /**
@@ -658,16 +658,16 @@ 
      * @return string sparql query clauses
      */
     protected function formatLimitAndOffset($limit, $offset) {
-        $limit = ($limit) ? 'LIMIT ' . $limit : '';
-        $offset = ($offset) ? 'OFFSET ' . $offset : '';
+        $limit = ($limit) ? 'LIMIT '.$limit : '';
+        $offset = ($offset) ? 'OFFSET '.$offset : '';
         // eliminating whitespace and line changes when the conditions aren't needed.
         $limitandoffset = '';
         if ($limit && $offset) {
-            $limitandoffset = "\n" . $limit . "\n" . $offset;
+            $limitandoffset = "\n".$limit."\n".$offset;
         } elseif ($limit) {
-            $limitandoffset = "\n" . $limit;
+            $limitandoffset = "\n".$limit;
         } elseif ($offset) {
-            $limitandoffset = "\n" . $offset;
+            $limitandoffset = "\n".$offset;
         }
 
         return $limitandoffset;
@@ -687,7 +687,7 @@ 
             }
         }
 
-        return implode(' UNION ', $typePatterns);;
+        return implode(' UNION ', $typePatterns); ;
     }
 
     /**
@@ -815,7 +815,7 @@ 
         // if search language and UI/display language differ, must also consider case where there is no prefLabel in
         // the display language; in that case, should use the label with the same language as the matched label
         $labelcondFallback = ($searchLang != $lang) ?
-          "OPTIONAL { # in case previous OPTIONAL block gives no labels\n" .
+          "OPTIONAL { # in case previous OPTIONAL block gives no labels\n".
           "?s skos:prefLabel ?label . FILTER (LANGMATCHES(LANG(?label), LANG(?match))) }" : "";
 
         /*
@@ -867,15 +867,15 @@ 
 
         $schemecond = '';
         if (!empty($schemes)) {
-            foreach($schemes as $scheme) {
+            foreach ($schemes as $scheme) {
                 $schemecond .= "?s skos:inScheme <$scheme> . ";
             }
         }
 
         // extra conditions for parent and group, if specified
-        $parentcond = ($params->getParentLimit()) ? "?s skos:broader+ <" . $params->getParentLimit() . "> ." : "";
-        $groupcond = ($params->getGroupLimit()) ? "<" . $params->getGroupLimit() . "> skos:member ?s ." : "";
-        $pgcond = $parentcond . $groupcond;
+        $parentcond = ($params->getParentLimit()) ? "?s skos:broader+ <".$params->getParentLimit()."> ." : "";
+        $groupcond = ($params->getGroupLimit()) ? "<".$params->getGroupLimit()."> skos:member ?s ." : "";
+        $pgcond = $parentcond.$groupcond;
 
         $orderextra = $this->isDefaultEndpoint() ? $this->graph : '';
 
@@ -943,9 +943,9 @@ 
             $hit['type'][] = $this->shortenUri($typeuri);
         }
 
-        if(!empty($fields)) {
+        if (!empty($fields)) {
             foreach ($fields as $prop) {
-                $propname = $prop . 's';
+                $propname = $prop.'s';
                 if (isset($row->$propname)) {
                     foreach (explode("\n", $row->$propname->getValue()) as $line) {
                         $rdata = str_getcsv($line, ',', '"', '"');
@@ -960,7 +960,7 @@ 
                             $propvals = $rdata[2];
                         }
 
-                        $hit['skos:' . $prop][] = $propvals;
+                        $hit['skos:'.$prop][] = $propvals;
                     }
                 }
             }
@@ -1426,7 +1426,7 @@ 
                 if (!isset($row->label) || $row->label->getLang() === $lang) {
                     $ret[$row->object->getUri()] = $val;
                 } elseif ($row->label->getLang() === $fallbacklang) {
-                    $val['label'] .= ' (' . $row->label->getLang() . ')';
+                    $val['label'] .= ' ('.$row->label->getLang().')';
                     $ret[$row->object->getUri()] = $val;
                 }
             }
@@ -1527,7 +1527,7 @@ 
                 if ($row->label->getLang() == $lang) {
                     $label = $row->label->getValue();
                 } else {
-                    $label = $row->label->getValue() . " (" . $row->label->getLang() . ")";
+                    $label = $row->label->getValue()." (".$row->label->getLang().")";
                 }
 
             }
@@ -1696,7 +1696,7 @@ 
                 if (isset($row->childlabel)) {
                     $label = $row->childlabel->getValue();
                     if ($row->childlabel->getLang() !== $lang) {
-                        $label .= " (" . $row->childlabel->getLang() . ")";
+                        $label .= " (".$row->childlabel->getLang().")";
                     }
 
                 }
@@ -1718,7 +1718,7 @@ 
             if (isset($row->label)) {
                 $preflabel = $row->label->getValue();
                 if ($row->label->getLang() !== $lang) {
-                    $preflabel .= ' (' . $row->label->getLang() . ')';
+                    $preflabel .= ' ('.$row->label->getLang().')';
                 }
 
                 $ret[$uri]['prefLabel'] = $preflabel;
@@ -1882,7 +1882,7 @@ 
                     if ($row->label->getLang() == $lang) {
                         $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue();
                     } else {
-                        $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue() . " (" . $row->label->getLang() . ")";
+                        $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue()." (".$row->label->getLang().")";
                     }
 
                 }
@@ -1923,7 +1923,7 @@ 
      */
     private function generateChangeListQuery($lang, $offset, $prop) {
         $gcl = $this->graphClause;
-        $offset = ($offset) ? 'OFFSET ' . $offset : '';
+        $offset = ($offset) ? 'OFFSET '.$offset : '';
 
         $query = <<<EOQ
 SELECT DISTINCT ?concept ?date ?label