NatLibFi / Skosmos

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

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[$value->getNotation() . $value->getLabel() . $value->getUri()] = $value;
+        $this->values[$value->getNotation().$value->getLabel().$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/WebController.php

Spacing +22 added lines, -22 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);
@@ -107,18 +107,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);
     }
 
     /**
@@ -276,9 +276,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";
@@ -300,11 +300,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;
@@ -317,10 +317,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);
@@ -328,7 +328,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(
@@ -375,7 +375,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);
             }
         }
@@ -386,7 +386,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;
@@ -402,7 +402,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,
@@ -427,7 +427,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(
@@ -448,7 +448,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(
@@ -465,7 +465,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(),
@@ -594,7 +594,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/LabelSkosXL.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     public function getPrefLabel() {
         $label = null;
         $labels = $this->resource->allResources('skosxl:prefLabel');
-        foreach($labels as $labres) {
+        foreach ($labels as $labres) {
             $label = $labres->getLiteral('skosxl:literalForm');
             if ($label->getLang() == $this->clang) {
                 return $label;
@@ -23,7 +23,7 @@ 
     public function getProperties() {
         $ret = array();
         $props = $this->resource->properties();
-        foreach($props as $prop) {
+        foreach ($props as $prop) {
             if ($prop !== 'skosxl:prefLabel') {
                 $ret[$prop] = $this->resource->get($prop);
             }

model/Concept.php

Spacing +25 added lines, -25 removed lines

@@ -137,9 +137,9 @@ 
                 return $this->resource->label($fallback);
             }
             // We need to check all the labels in case one of them matches a subtag of the current language
-            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);
                 }
             }
@@ -160,7 +160,7 @@ 
 
     public function hasXlLabel($prop = 'prefLabel')
     {
-        if ($this->resource->hasProperty('skosxl:' . $prop)) {
+        if ($this->resource->hasProperty('skosxl:'.$prop)) {
             return true;
         }
         return false;
@@ -169,7 +169,7 @@ 
     public function getXlLabel()
     {
         $labels = $this->resource->allResources('skosxl:prefLabel');
-        foreach($labels as $labres) {
+        foreach ($labels as $labres) {
             $label = $labres->getLiteral('skosxl:literalForm');
             if ($label !== null && $label->getLang() == $this->clang) {
                 return new LabelSkosXL($this->model, $labres);
@@ -276,7 +276,7 @@ 
         // catch external subjects that have $res as object
         $extSubjects = $exGraph->resourcesMatching("schema:about", $res);
 
-        $propList =  array_unique(array_merge(
+        $propList = array_unique(array_merge(
             $this->DEFAULT_EXT_PROPERTIES,
             $this->getVocab()->getConfig()->getExtProperties(),
             $this->getVocab()->getConfig()->getPlugins()->getExtProperties()
@@ -301,7 +301,7 @@ 
      * @param string[] $seen Processed resources so far
      * @param string[] $props (optional) limit to these property URIs
      */
-    private function addExternalTriplesToGraph($res, &$seen, $props=null)
+    private function addExternalTriplesToGraph($res, &$seen, $props = null)
     {
         if (array_key_exists($res->getUri(), $seen) && $seen[$res->getUri()] === 0) {
             return;
@@ -331,7 +331,7 @@ 
      */
     private function addPropertyValues($res, $prop, &$seen)
     {
-        $resList = $res->allResources('<' . $prop . '>');
+        $resList = $res->allResources('<'.$prop.'>');
 
         foreach ($resList as $res2) {
             if ($res2->isBNode()) {
@@ -341,7 +341,7 @@ 
             $this->addResourceReifications($res, $prop, $res2, $seen);
         }
 
-        $litList = $res->allLiterals('<' . $prop . '>');
+        $litList = $res->allLiterals('<'.$prop.'>');
 
         foreach ($litList as $lit) {
             $this->graph->addLiteral($res, $prop, $lit);
@@ -512,15 +512,15 @@ 
                 // if not found in current vocabulary, look up in the default graph to be able
                 // to read an ontology loaded in a separate graph
                 // note that this imply that the property has an rdf:type declared for the query to work
-                if(!$proplabel) {
+                if (!$proplabel) {
                     $envLangLabels = $this->model->getDefaultSparql()->queryLabel($longUri, $this->getEnvLang());
                     
                     $defaultPropLabel = $this->model->getDefaultSparql()->queryLabel($longUri, '');
 
-					if($envLangLabels) {
+					if ($envLangLabels) {
 						$proplabel = $envLangLabels[$this->getEnvLang()];
                     } else {
-						if($defaultPropLabel) {
+						if ($defaultPropLabel) {
 							$proplabel = $defaultPropLabel[''];
 						}
 					}
@@ -533,12 +533,12 @@ 
                 }
 
                 // also look up superprops in the default graph if not found in current vocabulary
-                if(!$superprops || empty($superprops)) {
+                if (!$superprops || empty($superprops)) {
                     $superprops = $this->model->getDefaultSparql()->querySuperProperties($longUri);
                 }
 
                 // we're reading only one super property, even if there are multiple ones
-                $superprop = ($superprops)?$superprops[0]:null;
+                $superprop = ($superprops) ? $superprops[0] : null;
                 if ($superprop) {
                     $superprop = EasyRdf\RdfNamespace::shorten($superprop) ? EasyRdf\RdfNamespace::shorten($superprop) : $superprop;
                 }
@@ -551,7 +551,7 @@ 
                 }
 
                 // searching for subproperties of literals too
-                if($superprops) {
+                if ($superprops) {
                     foreach ($superprops as $subi) {
                         $suburi = EasyRdf\RdfNamespace::shorten($subi) ? EasyRdf\RdfNamespace::shorten($subi) : $subi;
                         $duplicates[$suburi] = $prop;
@@ -671,14 +671,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'));
                 }
 
             }
@@ -686,12 +686,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;
@@ -763,7 +763,7 @@ 
                     $groups[$collLabel] = array($group);
 
                     $res = $collection;
-                    while($super = $this->graph->resourcesMatching('skos:member', $res)) {
+                    while ($super = $this->graph->resourcesMatching('skos:member', $res)) {
                         foreach ($super as $res) {
                             $superprop = new ConceptPropertyValue($this->model, $this->vocab, $res, 'skosmos:memberOfSuper', $this->clang);
                             array_unshift($groups[$collLabel], $superprop);
@@ -805,7 +805,7 @@ 
         $ret = array();
         foreach ($labels 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) {
                 $prop = in_array($lit, $prefLabels) ? 'skos:prefLabel' : 'skos:altLabel';
                 $ret[$this->literalLanguageToString($lit)][] = new ConceptPropertyValueLiteral($this->model, $this->vocab, $this->resource, $lit, $prop);
             }
@@ -867,10 +867,10 @@ 
             }
             else if ($context[$vocabPrefix] !== $vocabUriSpace) {
                 $i = 2;
-                while (isset($context[$vocabPrefix . $i]) && $context[$vocabPrefix . $i] !== $vocabUriSpace) {
+                while (isset($context[$vocabPrefix.$i]) && $context[$vocabPrefix.$i] !== $vocabUriSpace) {
                     $i += 1;
                 }
-                $context[$vocabPrefix . $i] = $vocabUriSpace;
+                $context[$vocabPrefix.$i] = $vocabUriSpace;
             }
         }
         $compactJsonLD = \ML\JsonLD\JsonLD::compact($this->graph->serialise('jsonld'), json_encode($context));

model/sparql/GenericSparql.php

Spacing +52 added lines, -52 removed lines

@@ -96,11 +96,11 @@ 
     private function performQuery($query) {
         $queryId = sprintf("%05d", rand(0, 99999));
         $logger = $this->model->getLogger();
-        $logger->info("[qid $queryId] SPARQL query:\n" . $this->generateQueryPrefixes($query) . "\n$query\n");
+        $logger->info("[qid $queryId] SPARQL query:\n".$this->generateQueryPrefixes($query)."\n$query\n");
         $starttime = microtime(true);
         $result = $this->client->query($query);
         $elapsed = intval(round((microtime(true) - $starttime) * 1000));
-        if(method_exists($result, 'numRows')) {
+        if (method_exists($result, 'numRows')) {
             $numRows = $result->numRows();
             $logger->info("[qid $queryId] result: $numRows rows returned in $elapsed ms");
         } else { // graph result
@@ -136,20 +136,20 @@ 
      * @param Vocabulary[]|null $vocabs
      * @return string
      */
-    protected function generateFromClause($vocabs=null) {
+    protected function generateFromClause($vocabs = null) {
         $graphs = array();
         $clause = '';
         if (!$vocabs) {
             return $this->graph !== '?graph' && $this->graph !== NULL ? "FROM <$this->graph>" : '';
         }
-        foreach($vocabs as $vocab) {
+        foreach ($vocabs as $vocab) {
             $graph = $vocab->getGraph();
             if (!in_array($graph, $graphs)) {
                 array_push($graphs, $graph);
             }
         }
         foreach ($graphs as $graph) {
-            if($graph !== NULL)
+            if ($graph !== NULL)
                 $clause .= "FROM NAMED <$graph> "; 
         }
         return $clause;
@@ -693,9 +693,9 @@ 
                 $conceptscheme['title'] = $row->title->getValue();
             }
             // add dct:subject and their labels in the result
-            if(isset($row->domain) && isset($row->domainLabel)){
-                $conceptscheme['subject']['uri']=$row->domain->getURI();
-                $conceptscheme['subject']['prefLabel']=$row->domainLabel->getValue();
+            if (isset($row->domain) && isset($row->domainLabel)) {
+                $conceptscheme['subject']['uri'] = $row->domain->getURI();
+                $conceptscheme['subject']['prefLabel'] = $row->domainLabel->getValue();
             }
 
             $ret[$row->cs->getURI()] = $conceptscheme;
@@ -758,7 +758,7 @@ 
         foreach ($graphs as $graph) {
           $values[] = "<$graph>";
         }
-        return "FILTER (?graph IN (" . implode(',', $values) . "))";
+        return "FILTER (?graph IN (".implode(',', $values)."))";
     }
 
     /**
@@ -768,16 +768,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;
@@ -929,14 +929,14 @@ 
         // 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))) }" : "";
           
         //  Including the labels if there is no query term given.
         if ($rawterm === '') {
           $labelClause = "?s skos:prefLabel ?label .";
-          $labelClause = ($lang) ? $labelClause . " FILTER (LANGMATCHES(LANG(?label), '$lang'))" : $labelClause . "";
-          return $labelClause . " BIND(?label AS ?match)";
+          $labelClause = ($lang) ? $labelClause." FILTER (LANGMATCHES(LANG(?label), '$lang'))" : $labelClause."";
+          return $labelClause." BIND(?label AS ?match)";
         }
 
         /*
@@ -1000,20 +1000,20 @@ 
         $schemecond = '';
         if (!empty($schemes)) {
             $conditions = array();
-            foreach($schemes as $scheme) {
+            foreach ($schemes as $scheme) {
                 $conditions[] = "{?s skos:inScheme <$scheme>}";
             }
-            $schemecond = '{'.implode(" UNION ",$conditions).'}';
+            $schemecond = '{'.implode(" UNION ", $conditions).'}';
         }
-        $filterDeprecated="";
+        $filterDeprecated = "";
         //show or hide deprecated concepts
-        if(!$showDeprecated){
-            $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }";
+        if (!$showDeprecated) {
+            $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
         }
         // 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 : '';
 
@@ -1086,9 +1086,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, ',', '"', '"');
@@ -1103,7 +1103,7 @@ 
                             $propvals = $rdata[2];
                         }
 
-                        $hit['skos:' . $prop][] = $propvals;
+                        $hit['skos:'.$prop][] = $propvals;
                     }
                 }
             }
@@ -1179,7 +1179,7 @@ 
      * @return array query result object
      */
     public function queryConcepts($vocabs, $fields = null, $unique = false, $params, $showDeprecated = false) {
-        $query = $this->generateConceptSearchQuery($fields, $unique, $params,$showDeprecated);
+        $query = $this->generateConceptSearchQuery($fields, $unique, $params, $showDeprecated);
         $results = $this->query($query);
         return $this->transformConceptSearchResults($results, $vocabs, $fields);
     }
@@ -1233,9 +1233,9 @@ 
         $conditions = $this->formatFilterConditions($letter, $lang);
         $filtercondLabel = $conditions['filterpref'];
         $filtercondALabel = $conditions['filteralt'];
-        $filterDeprecated="";
-        if(!$showDeprecated){
-            $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }";
+        $filterDeprecated = "";
+        if (!$showDeprecated) {
+            $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
         }
         $query = <<<EOQ
 SELECT DISTINCT ?s ?label ?alabel $fcl
@@ -1311,8 +1311,8 @@ 
      * @param array $classes
      * @param boolean $showDeprecated whether to include deprecated concepts in the result (default: false)
      */
-    public function queryConceptsAlphabetical($letter, $lang, $limit = null, $offset = null, $classes = null,$showDeprecated = false) {
-        $query = $this->generateAlphabeticalListQuery($letter, $lang, $limit, $offset, $classes,$showDeprecated);
+    public function queryConceptsAlphabetical($letter, $lang, $limit = null, $offset = null, $classes = null, $showDeprecated = false) {
+        $query = $this->generateAlphabeticalListQuery($letter, $lang, $limit, $offset, $classes, $showDeprecated);
         $results = $this->query($query);
         return $this->transformAlphabeticalListResults($results);
     }
@@ -1646,7 +1646,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;
                 }
             }
@@ -1742,10 +1742,10 @@ 
 
             $label = null;
             if (isset($row->label)) {
-                if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang . "-") == 0) {
+                if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang."-") == 0) {
                     $label = $row->label->getValue();
                 } else {
-                    $label = $row->label->getValue() . " (" . $row->label->getLang() . ")";
+                    $label = $row->label->getValue()." (".$row->label->getLang().")";
                 }
 
             }
@@ -1821,8 +1821,8 @@ 
         foreach ($result as $row) {
             if (isset($row->top) && isset($row->label)) {
                 $label = $row->label->getValue();
-                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang . "-") !== 0) {
-                    $label .= ' (' . $row->label->getLang() . ')';
+                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang."-") !== 0) {
+                    $label .= ' ('.$row->label->getLang().')';
                 }
                 $top = array('uri' => $row->top->getUri(), 'topConceptOf' => $row->topuri->getUri(), 'label' => $label, 'hasChildren' => filter_var($row->children->getValue(), FILTER_VALIDATE_BOOLEAN));
                 if (isset($row->notation)) {
@@ -1915,7 +1915,7 @@ 
                 $ret[$uri]['exact'] = $row->exact->getUri();
             }
             if (isset($row->tops)) {
-               $topConceptsList=explode(" ", $row->tops->getValue());
+               $topConceptsList = explode(" ", $row->tops->getValue());
                // sort to garantee an alphabetical ordering of the URI
                sort($topConceptsList);
                $ret[$uri]['tops'] = $topConceptsList;
@@ -1928,8 +1928,8 @@ 
                 $label = null;
                 if (isset($row->childlabel)) {
                     $label = $row->childlabel->getValue();
-                    if ($row->childlabel->getLang() !== $lang && strpos($row->childlabel->getLang(), $lang . "-") !== 0) {
-                        $label .= " (" . $row->childlabel->getLang() . ")";
+                    if ($row->childlabel->getLang() !== $lang && strpos($row->childlabel->getLang(), $lang."-") !== 0) {
+                        $label .= " (".$row->childlabel->getLang().")";
                     }
 
                 }
@@ -1950,8 +1950,8 @@ 
             }
             if (isset($row->label)) {
                 $preflabel = $row->label->getValue();
-                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang . "-") !== 0) {
-                    $preflabel .= ' (' . $row->label->getLang() . ')';
+                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang."-") !== 0) {
+                    $preflabel .= ' ('.$row->label->getLang().')';
                 }
 
                 $ret[$uri]['prefLabel'] = $preflabel;
@@ -2072,9 +2072,9 @@ 
      */
     private function generateConceptGroupContentsQuery($groupClass, $group, $lang, $showDeprecated = false) {
         $fcl = $this->generateFromClause();
-        $filterDeprecated="";
-        if(!$showDeprecated){
-            $filterDeprecated="  FILTER NOT EXISTS { ?conc owl:deprecated true }";
+        $filterDeprecated = "";
+        if (!$showDeprecated) {
+            $filterDeprecated = "  FILTER NOT EXISTS { ?conc owl:deprecated true }";
         }
         $query = <<<EOQ
 SELECT ?conc ?super ?label ?members ?type ?notation $fcl
@@ -2113,10 +2113,10 @@ 
                     'type' => array($row->type->shorten()),
                 );
                 if (isset($row->label)) {
-                    if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang . "-") == 0) {
+                    if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang."-") == 0) {
                         $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().")";
                     }
 
                 }
@@ -2144,8 +2144,8 @@ 
      * @param boolean $showDeprecated whether to include deprecated concepts in search results
      * @return array Result array with concept URI as key and concept label as value
      */
-    public function listConceptGroupContents($groupClass, $group, $lang,$showDeprecated = false) {
-        $query = $this->generateConceptGroupContentsQuery($groupClass, $group, $lang,$showDeprecated);
+    public function listConceptGroupContents($groupClass, $group, $lang, $showDeprecated = false) {
+        $query = $this->generateConceptGroupContentsQuery($groupClass, $group, $lang, $showDeprecated);
         $result = $this->query($query);
         return $this->transformConceptGroupContentsResults($result, $lang);
     }
@@ -2158,7 +2158,7 @@ 
      */
     private function generateChangeListQuery($lang, $offset, $prop) {
         $fcl = $this->generateFromClause();
-        $offset = ($offset) ? 'OFFSET ' . $offset : '';
+        $offset = ($offset) ? 'OFFSET '.$offset : '';
 
         $query = <<<EOQ
 SELECT DISTINCT ?concept ?date ?label $fcl