Completed
Pull Request — master (#803)
by Dan Michael O.
25:42
created
migrate-config.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@
 block discarded – undo
84 84
     foreach (explode(' ', GLOBAL_PLUGINS) as $pluginName) {
85 85
         $globalPluginsArray[] = "\"$pluginName\"";
86 86
     }
87
-    $globalPlugins = " " . implode(', ', $globalPluginsArray) . " ";
87
+    $globalPlugins = " ".implode(', ', $globalPluginsArray)." ";
88 88
 }
89 89
 
90 90
 # print the prefixes
Please login to merge, or discard this patch.
model/ConceptProperty.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
      * @param string $prop property type eg. 'rdf:type'.
23 23
      * @param string $label
24 24
      */
25
-    public function __construct($prop, $label, $super=null, $sort_by_notation=false)
25
+    public function __construct($prop, $label, $super = null, $sort_by_notation = false)
26 26
     {
27 27
         $this->prop = $prop;
28 28
         $this->label = $label;
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
      */
62 62
     public function getDescription()
63 63
     {
64
-        $helpprop = $this->prop . "_help";
64
+        $helpprop = $this->prop."_help";
65 65
 
66 66
         return gettext($helpprop); // can't use string constant, it'd be picked up by xgettext
67 67
     }
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 
81 81
     public function addValue($value)
82 82
     {
83
-        $this->values[$value->getNotation() . $value->getLabel() . $value->getUri()] = $value;
83
+        $this->values[$value->getNotation().$value->getLabel().$value->getUri()] = $value;
84 84
         $this->is_sorted = false;
85 85
     }
86 86
 
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
     {
89 89
         if (!empty($this->values)) {
90 90
             uksort($this->values, function($a, $b) {
91
-                return $this->sort_by_notation ? strnatcasecmp($a, $b) : strcoll(strtolower($a),strtolower($b));
91
+                return $this->sort_by_notation ? strnatcasecmp($a, $b) : strcoll(strtolower($a), strtolower($b));
92 92
             });
93 93
         }
94 94
         $this->is_sorted = true;
Please login to merge, or discard this patch.
controller/WebController.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
         // specify where to look for templates and cache
38 38
         $loader = new Twig_Loader_Filesystem('view');
39 39
         // initialize Twig environment
40
-        $this->twig = new Twig_Environment($loader, array('cache' => $tmpDir,'auto_reload' => true));
40
+        $this->twig = new Twig_Environment($loader, array('cache' => $tmpDir, 'auto_reload' => true));
41 41
         $this->twig->addExtension(new Twig_Extensions_Extension_I18n());
42 42
         // used for setting the base href for the relative urls
43 43
         $this->twig->addGlobal("BaseHref", $this->getBaseHref());
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
         $this->twig->addFilter(new Twig_SimpleFilter('link_url', array($this, 'linkUrlFilter')));
61 61
 
62 62
         // register a Twig filter for generating strings from language codes with CLDR
63
-        $langFilter = new Twig_SimpleFilter('lang_name', function ($langcode, $lang) {
63
+        $langFilter = new Twig_SimpleFilter('lang_name', function($langcode, $lang) {
64 64
             return Language::getName($langcode, $lang);
65 65
         });
66 66
         $this->twig->addFilter($langFilter);
@@ -107,18 +107,18 @@  discard block
 block discarded – undo
107 107
         $localname = $vocab->getLocalName($uri);
108 108
         if ($localname !== $uri && $localname === urlencode($localname)) {
109 109
             // check that the prefix stripping worked, and there are no problematic chars in localname
110
-            $paramstr = sizeof($params) > 0 ? '?' . http_build_query($params) : '';
110
+            $paramstr = sizeof($params) > 0 ? '?'.http_build_query($params) : '';
111 111
             if ($type && $type !== '' && $type !== 'vocab' && !($localname === '' && $type === 'page')) {
112
-                return "$vocid/$lang/$type/$localname" . $paramstr;
112
+                return "$vocid/$lang/$type/$localname".$paramstr;
113 113
             }
114 114
 
115
-            return "$vocid/$lang/$localname" . $paramstr;
115
+            return "$vocid/$lang/$localname".$paramstr;
116 116
         }
117 117
 
118 118
         // case 2: URI outside vocabulary namespace, or has problematic chars
119 119
         // pass the full URI as parameter instead
120 120
         $params['uri'] = $uri;
121
-        return "$vocid/$lang/$type/?" . http_build_query($params);
121
+        return "$vocid/$lang/$type/?".http_build_query($params);
122 122
     }
123 123
 
124 124
     /**
@@ -276,9 +276,9 @@  discard block
 block discarded – undo
276 276
     private function createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender)
277 277
     {
278 278
         $headers = "MIME-Version: 1.0″ . '\r\n";
279
-        $headers .= "Content-type: text/html; charset=UTF-8" . "\r\n";
279
+        $headers .= "Content-type: text/html; charset=UTF-8"."\r\n";
280 280
         if (!empty($toMail)) {
281
-            $headers .= "Cc: " . $this->model->getConfig()->getFeedbackAddress() . "\r\n";
281
+            $headers .= "Cc: ".$this->model->getConfig()->getFeedbackAddress()."\r\n";
282 282
         }
283 283
         if (!empty($fromEmail)) {
284 284
             $headers .= "Reply-To: $fromName <$fromEmail>\r\n";
@@ -300,11 +300,11 @@  discard block
 block discarded – undo
300 300
     {
301 301
         $toAddress = ($toMail) ? $toMail : $this->model->getConfig()->getFeedbackAddress();
302 302
         if ($fromVocab !== null && $fromVocab !== '') {
303
-            $message = 'Feedback from vocab: ' . strtoupper($fromVocab) . "<br />" . $message;
303
+            $message = 'Feedback from vocab: '.strtoupper($fromVocab)."<br />".$message;
304 304
         }
305 305
 
306 306
         $envelopeSender = $this->model->getConfig()->getFeedbackEnvelopeSender();
307
-        $subject = $this->model->getConfig()->getServiceName() . " feedback";
307
+        $subject = $this->model->getConfig()->getServiceName()." feedback";
308 308
         // determine the sender address of the message
309 309
         $sender = $this->model->getConfig()->getFeedbackSender();
310 310
         if (empty($sender)) $sender = $envelopeSender;
@@ -317,10 +317,10 @@  discard block
 block discarded – undo
317 317
         $params = empty($envelopeSender) ? '' : "-f $envelopeSender";
318 318
 
319 319
         // adding some information about the user for debugging purposes.
320
-        $message = $message . "<br /><br /> Debugging information:"
321
-            . "<br />Timestamp: " . date(DATE_RFC2822)
322
-            . "<br />User agent: " . $request->getServerConstant('HTTP_USER_AGENT')
323
-            . "<br />Referer: " . $request->getServerConstant('HTTP_REFERER');
320
+        $message = $message."<br /><br /> Debugging information:"
321
+            . "<br />Timestamp: ".date(DATE_RFC2822)
322
+            . "<br />User agent: ".$request->getServerConstant('HTTP_USER_AGENT')
323
+            . "<br />Referer: ".$request->getServerConstant('HTTP_REFERER');
324 324
 
325 325
         try {
326 326
             mail($toAddress, $subject, $message, $headers, $params);
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
             header("HTTP/1.0 404 Not Found");
329 329
             $template = $this->twig->loadTemplate('error-page.twig');
330 330
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
331
-                error_log('Caught exception: ' . $e->getMessage());
331
+                error_log('Caught exception: '.$e->getMessage());
332 332
             }
333 333
 
334 334
             echo $template->render(
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
         $vocids = ($vocabs !== null && $vocabs !== '') ? explode(' ', $vocabs) : null;
376 376
         $vocabObjects = array();
377 377
         if ($vocids) {
378
-            foreach($vocids as $vocid) {
378
+            foreach ($vocids as $vocid) {
379 379
                 $vocabObjects[] = $this->model->getVocabulary($vocid);
380 380
             }
381 381
         }
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
         } catch (Exception $e) {
387 387
             header("HTTP/1.0 404 Not Found");
388 388
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
389
-                error_log('Caught exception: ' . $e->getMessage());
389
+                error_log('Caught exception: '.$e->getMessage());
390 390
             }
391 391
             $this->invokeGenericErrorPage($request, $e->getMessage());
392 392
             return;
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
                 'search_count' => $counts,
403 403
                 'languages' => $this->languages,
404 404
                 'search_results' => $searchResults,
405
-                'rest' => $parameters->getOffset()>0,
405
+                'rest' => $parameters->getOffset() > 0,
406 406
                 'global_search' => true,
407 407
                 'term' => $request->getQueryParamRaw('q'),
408 408
                 'lang_list' => $langList,
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
         } catch (Exception $e) {
428 428
             header("HTTP/1.0 404 Not Found");
429 429
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
430
-                error_log('Caught exception: ' . $e->getMessage());
430
+                error_log('Caught exception: '.$e->getMessage());
431 431
             }
432 432
 
433 433
             echo $template->render(
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
         } catch (Exception $e) {
449 449
             header("HTTP/1.0 404 Not Found");
450 450
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
451
-                error_log('Caught exception: ' . $e->getMessage());
451
+                error_log('Caught exception: '.$e->getMessage());
452 452
             }
453 453
 
454 454
             echo $template->render(
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
465 465
                 'vocab' => $vocab,
466 466
                 'search_results' => $searchResults,
467 467
                 'search_count' => $counts,
468
-                'rest' => $parameters->getOffset()>0,
468
+                'rest' => $parameters->getOffset() > 0,
469 469
                 'limit_parent' => $parameters->getParentLimit(),
470 470
                 'limit_type' =>  $request->getQueryParam('type') ? explode('+', $request->getQueryParam('type')) : null,
471 471
                 'limit_group' => $parameters->getGroupLimit(),
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
      * Loads and renders the view containing a list of recent changes in the vocabulary.
595 595
      * @param Request $request
596 596
      */
597
-    public function invokeChangeList($request, $prop='dc:created')
597
+    public function invokeChangeList($request, $prop = 'dc:created')
598 598
     {
599 599
         // set language parameters for gettext
600 600
         $this->setLanguageProperties($request->getLang());
Please login to merge, or discard this patch.
model/sparql/GenericSparql.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -87,11 +87,11 @@  discard block
 block discarded – undo
87 87
     protected function query($query) {
88 88
         $queryId = sprintf("%05d", rand(0, 99999));
89 89
         $logger = $this->model->getLogger();
90
-        $logger->info("[qid $queryId] SPARQL query:\n" . $this->generateQueryPrefixes($query) . "\n$query\n");
90
+        $logger->info("[qid $queryId] SPARQL query:\n".$this->generateQueryPrefixes($query)."\n$query\n");
91 91
         $starttime = microtime(true);
92 92
         $result = $this->client->query($query);
93 93
         $elapsed = intval(round((microtime(true) - $starttime) * 1000));
94
-        if(method_exists($result, 'numRows')) {
94
+        if (method_exists($result, 'numRows')) {
95 95
             $numRows = $result->numRows();
96 96
             $logger->info("[qid $queryId] result: $numRows rows returned in $elapsed ms");
97 97
         } else { // graph result
@@ -107,20 +107,20 @@  discard block
 block discarded – undo
107 107
      * @param Vocabulary[]|null $vocabs
108 108
      * @return string
109 109
      */
110
-    protected function generateFromClause($vocabs=null) {
110
+    protected function generateFromClause($vocabs = null) {
111 111
         $graphs = array();
112 112
         $clause = '';
113 113
         if (!$vocabs) {
114 114
             return $this->graph !== '?graph' && $this->graph !== NULL ? "FROM <$this->graph>" : '';
115 115
         }
116
-        foreach($vocabs as $vocab) {
116
+        foreach ($vocabs as $vocab) {
117 117
             $graph = $vocab->getGraph();
118 118
             if (!in_array($graph, $graphs)) {
119 119
                 array_push($graphs, $graph);
120 120
             }
121 121
         }
122 122
         foreach ($graphs as $graph) {
123
-            if($graph !== NULL)
123
+            if ($graph !== NULL)
124 124
                 $clause .= "FROM NAMED <$graph> "; 
125 125
         }
126 126
         return $clause;
@@ -664,9 +664,9 @@  discard block
 block discarded – undo
664 664
                 $conceptscheme['title'] = $row->title->getValue();
665 665
             }
666 666
             // add dct:subject and their labels in the result
667
-            if(isset($row->domain) && isset($row->domainLabel)){
668
-                $conceptscheme['subject']['uri']=$row->domain->getURI();
669
-                $conceptscheme['subject']['prefLabel']=$row->domainLabel->getValue();
667
+            if (isset($row->domain) && isset($row->domainLabel)) {
668
+                $conceptscheme['subject']['uri'] = $row->domain->getURI();
669
+                $conceptscheme['subject']['prefLabel'] = $row->domainLabel->getValue();
670 670
             }
671 671
 
672 672
             $ret[$row->cs->getURI()] = $conceptscheme;
@@ -729,7 +729,7 @@  discard block
 block discarded – undo
729 729
         foreach ($graphs as $graph) {
730 730
           $values[] = "<$graph>";
731 731
         }
732
-        return "FILTER (?graph IN (" . implode(',', $values) . "))";
732
+        return "FILTER (?graph IN (".implode(',', $values)."))";
733 733
     }
734 734
 
735 735
     /**
@@ -739,16 +739,16 @@  discard block
 block discarded – undo
739 739
      * @return string sparql query clauses
740 740
      */
741 741
     protected function formatLimitAndOffset($limit, $offset) {
742
-        $limit = ($limit) ? 'LIMIT ' . $limit : '';
743
-        $offset = ($offset) ? 'OFFSET ' . $offset : '';
742
+        $limit = ($limit) ? 'LIMIT '.$limit : '';
743
+        $offset = ($offset) ? 'OFFSET '.$offset : '';
744 744
         // eliminating whitespace and line changes when the conditions aren't needed.
745 745
         $limitandoffset = '';
746 746
         if ($limit && $offset) {
747
-            $limitandoffset = "\n" . $limit . "\n" . $offset;
747
+            $limitandoffset = "\n".$limit."\n".$offset;
748 748
         } elseif ($limit) {
749
-            $limitandoffset = "\n" . $limit;
749
+            $limitandoffset = "\n".$limit;
750 750
         } elseif ($offset) {
751
-            $limitandoffset = "\n" . $offset;
751
+            $limitandoffset = "\n".$offset;
752 752
         }
753 753
 
754 754
         return $limitandoffset;
@@ -900,14 +900,14 @@  discard block
 block discarded – undo
900 900
         // if search language and UI/display language differ, must also consider case where there is no prefLabel in
901 901
         // the display language; in that case, should use the label with the same language as the matched label
902 902
         $labelcondFallback = ($searchLang != $lang) ?
903
-          "OPTIONAL { # in case previous OPTIONAL block gives no labels\n" .
903
+          "OPTIONAL { # in case previous OPTIONAL block gives no labels\n".
904 904
           "?s skos:prefLabel ?label . FILTER (LANGMATCHES(LANG(?label), LANG(?match))) }" : "";
905 905
           
906 906
         //  Including the labels if there is no query term given.
907 907
         if ($rawterm === '') {
908 908
           $labelClause = "?s skos:prefLabel ?label .";
909
-          $labelClause = ($lang) ? $labelClause . " FILTER (LANGMATCHES(LANG(?label), '$lang'))" : $labelClause . "";
910
-          return $labelClause . " BIND(?label AS ?match)";
909
+          $labelClause = ($lang) ? $labelClause." FILTER (LANGMATCHES(LANG(?label), '$lang'))" : $labelClause."";
910
+          return $labelClause." BIND(?label AS ?match)";
911 911
         }
912 912
 
913 913
         /*
@@ -971,20 +971,20 @@  discard block
 block discarded – undo
971 971
         $schemecond = '';
972 972
         if (!empty($schemes)) {
973 973
             $conditions = array();
974
-            foreach($schemes as $scheme) {
974
+            foreach ($schemes as $scheme) {
975 975
                 $conditions[] = "{?s skos:inScheme <$scheme>}";
976 976
             }
977
-            $schemecond = '{'.implode(" UNION ",$conditions).'}';
977
+            $schemecond = '{'.implode(" UNION ", $conditions).'}';
978 978
         }
979
-        $filterDeprecated="";
979
+        $filterDeprecated = "";
980 980
         //show or hide deprecated concepts
981
-        if(!$showDeprecated){
982
-            $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }";
981
+        if (!$showDeprecated) {
982
+            $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
983 983
         }
984 984
         // extra conditions for parent and group, if specified
985
-        $parentcond = ($params->getParentLimit()) ? "?s skos:broader+ <" . $params->getParentLimit() . "> ." : "";
986
-        $groupcond = ($params->getGroupLimit()) ? "<" . $params->getGroupLimit() . "> skos:member ?s ." : "";
987
-        $pgcond = $parentcond . $groupcond;
985
+        $parentcond = ($params->getParentLimit()) ? "?s skos:broader+ <".$params->getParentLimit()."> ." : "";
986
+        $groupcond = ($params->getGroupLimit()) ? "<".$params->getGroupLimit()."> skos:member ?s ." : "";
987
+        $pgcond = $parentcond.$groupcond;
988 988
 
989 989
         $orderextra = $this->isDefaultEndpoint() ? $this->graph : '';
990 990
 
@@ -1057,9 +1057,9 @@  discard block
 block discarded – undo
1057 1057
             $hit['type'][] = $this->shortenUri($typeuri);
1058 1058
         }
1059 1059
 
1060
-        if(!empty($fields)) {
1060
+        if (!empty($fields)) {
1061 1061
             foreach ($fields as $prop) {
1062
-                $propname = $prop . 's';
1062
+                $propname = $prop.'s';
1063 1063
                 if (isset($row->$propname)) {
1064 1064
                     foreach (explode("\n", $row->$propname->getValue()) as $line) {
1065 1065
                         $rdata = str_getcsv($line, ',', '"', '"');
@@ -1074,7 +1074,7 @@  discard block
 block discarded – undo
1074 1074
                             $propvals = $rdata[2];
1075 1075
                         }
1076 1076
 
1077
-                        $hit['skos:' . $prop][] = $propvals;
1077
+                        $hit['skos:'.$prop][] = $propvals;
1078 1078
                     }
1079 1079
                 }
1080 1080
             }
@@ -1150,7 +1150,7 @@  discard block
 block discarded – undo
1150 1150
      * @return array query result object
1151 1151
      */
1152 1152
     public function queryConcepts($vocabs, $fields = null, $unique = false, $params, $showDeprecated = false) {
1153
-        $query = $this->generateConceptSearchQuery($fields, $unique, $params,$showDeprecated);
1153
+        $query = $this->generateConceptSearchQuery($fields, $unique, $params, $showDeprecated);
1154 1154
         $results = $this->query($query);
1155 1155
         return $this->transformConceptSearchResults($results, $vocabs, $fields);
1156 1156
     }
@@ -1204,9 +1204,9 @@  discard block
 block discarded – undo
1204 1204
         $conditions = $this->formatFilterConditions($letter, $lang);
1205 1205
         $filtercondLabel = $conditions['filterpref'];
1206 1206
         $filtercondALabel = $conditions['filteralt'];
1207
-        $filterDeprecated="";
1208
-        if(!$showDeprecated){
1209
-            $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }";
1207
+        $filterDeprecated = "";
1208
+        if (!$showDeprecated) {
1209
+            $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
1210 1210
         }
1211 1211
         $query = <<<EOQ
1212 1212
 SELECT DISTINCT ?s ?label ?alabel $fcl
@@ -1282,8 +1282,8 @@  discard block
 block discarded – undo
1282 1282
      * @param array $classes
1283 1283
      * @param boolean $showDeprecated whether to include deprecated concepts in the result (default: false)
1284 1284
      */
1285
-    public function queryConceptsAlphabetical($letter, $lang, $limit = null, $offset = null, $classes = null,$showDeprecated = false) {
1286
-        $query = $this->generateAlphabeticalListQuery($letter, $lang, $limit, $offset, $classes,$showDeprecated);
1285
+    public function queryConceptsAlphabetical($letter, $lang, $limit = null, $offset = null, $classes = null, $showDeprecated = false) {
1286
+        $query = $this->generateAlphabeticalListQuery($letter, $lang, $limit, $offset, $classes, $showDeprecated);
1287 1287
         $results = $this->query($query);
1288 1288
         return $this->transformAlphabeticalListResults($results);
1289 1289
     }
@@ -1617,7 +1617,7 @@  discard block
 block discarded – undo
1617 1617
                 if (!isset($row->label) || $row->label->getLang() === $lang) {
1618 1618
                     $ret[$row->object->getUri()] = $val;
1619 1619
                 } elseif ($row->label->getLang() === $fallbacklang) {
1620
-                    $val['label'] .= ' (' . $row->label->getLang() . ')';
1620
+                    $val['label'] .= ' ('.$row->label->getLang().')';
1621 1621
                     $ret[$row->object->getUri()] = $val;
1622 1622
                 }
1623 1623
             }
@@ -1713,10 +1713,10 @@  discard block
 block discarded – undo
1713 1713
 
1714 1714
             $label = null;
1715 1715
             if (isset($row->label)) {
1716
-                if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang . "-") == 0) {
1716
+                if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang."-") == 0) {
1717 1717
                     $label = $row->label->getValue();
1718 1718
                 } else {
1719
-                    $label = $row->label->getValue() . " (" . $row->label->getLang() . ")";
1719
+                    $label = $row->label->getValue()." (".$row->label->getLang().")";
1720 1720
                 }
1721 1721
 
1722 1722
             }
@@ -1792,8 +1792,8 @@  discard block
 block discarded – undo
1792 1792
         foreach ($result as $row) {
1793 1793
             if (isset($row->top) && isset($row->label)) {
1794 1794
                 $label = $row->label->getValue();
1795
-                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang . "-") !== 0) {
1796
-                    $label .= ' (' . $row->label->getLang() . ')';
1795
+                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang."-") !== 0) {
1796
+                    $label .= ' ('.$row->label->getLang().')';
1797 1797
                 }
1798 1798
                 $top = array('uri' => $row->top->getUri(), 'topConceptOf' => $row->topuri->getUri(), 'label' => $label, 'hasChildren' => filter_var($row->children->getValue(), FILTER_VALIDATE_BOOLEAN));
1799 1799
                 if (isset($row->notation)) {
@@ -1886,7 +1886,7 @@  discard block
 block discarded – undo
1886 1886
                 $ret[$uri]['exact'] = $row->exact->getUri();
1887 1887
             }
1888 1888
             if (isset($row->tops)) {
1889
-               $topConceptsList=explode(" ", $row->tops->getValue());
1889
+               $topConceptsList = explode(" ", $row->tops->getValue());
1890 1890
                // sort to garantee an alphabetical ordering of the URI
1891 1891
                sort($topConceptsList);
1892 1892
                $ret[$uri]['tops'] = $topConceptsList;
@@ -1899,8 +1899,8 @@  discard block
 block discarded – undo
1899 1899
                 $label = null;
1900 1900
                 if (isset($row->childlabel)) {
1901 1901
                     $label = $row->childlabel->getValue();
1902
-                    if ($row->childlabel->getLang() !== $lang && strpos($row->childlabel->getLang(), $lang . "-") !== 0) {
1903
-                        $label .= " (" . $row->childlabel->getLang() . ")";
1902
+                    if ($row->childlabel->getLang() !== $lang && strpos($row->childlabel->getLang(), $lang."-") !== 0) {
1903
+                        $label .= " (".$row->childlabel->getLang().")";
1904 1904
                     }
1905 1905
 
1906 1906
                 }
@@ -1921,8 +1921,8 @@  discard block
 block discarded – undo
1921 1921
             }
1922 1922
             if (isset($row->label)) {
1923 1923
                 $preflabel = $row->label->getValue();
1924
-                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang . "-") !== 0) {
1925
-                    $preflabel .= ' (' . $row->label->getLang() . ')';
1924
+                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang."-") !== 0) {
1925
+                    $preflabel .= ' ('.$row->label->getLang().')';
1926 1926
                 }
1927 1927
 
1928 1928
                 $ret[$uri]['prefLabel'] = $preflabel;
@@ -2043,9 +2043,9 @@  discard block
 block discarded – undo
2043 2043
      */
2044 2044
     private function generateConceptGroupContentsQuery($groupClass, $group, $lang, $showDeprecated = false) {
2045 2045
         $fcl = $this->generateFromClause();
2046
-        $filterDeprecated="";
2047
-        if(!$showDeprecated){
2048
-            $filterDeprecated="  FILTER NOT EXISTS { ?conc owl:deprecated true }";
2046
+        $filterDeprecated = "";
2047
+        if (!$showDeprecated) {
2048
+            $filterDeprecated = "  FILTER NOT EXISTS { ?conc owl:deprecated true }";
2049 2049
         }
2050 2050
         $query = <<<EOQ
2051 2051
 SELECT ?conc ?super ?label ?members ?type ?notation $fcl
@@ -2084,10 +2084,10 @@  discard block
 block discarded – undo
2084 2084
                     'type' => array($row->type->shorten()),
2085 2085
                 );
2086 2086
                 if (isset($row->label)) {
2087
-                    if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang . "-") == 0) {
2087
+                    if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang."-") == 0) {
2088 2088
                         $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue();
2089 2089
                     } else {
2090
-                        $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue() . " (" . $row->label->getLang() . ")";
2090
+                        $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue()." (".$row->label->getLang().")";
2091 2091
                     }
2092 2092
 
2093 2093
                 }
@@ -2115,8 +2115,8 @@  discard block
 block discarded – undo
2115 2115
      * @param boolean $showDeprecated whether to include deprecated concepts in search results
2116 2116
      * @return array Result array with concept URI as key and concept label as value
2117 2117
      */
2118
-    public function listConceptGroupContents($groupClass, $group, $lang,$showDeprecated = false) {
2119
-        $query = $this->generateConceptGroupContentsQuery($groupClass, $group, $lang,$showDeprecated);
2118
+    public function listConceptGroupContents($groupClass, $group, $lang, $showDeprecated = false) {
2119
+        $query = $this->generateConceptGroupContentsQuery($groupClass, $group, $lang, $showDeprecated);
2120 2120
         $result = $this->query($query);
2121 2121
         return $this->transformConceptGroupContentsResults($result, $lang);
2122 2122
     }
@@ -2129,7 +2129,7 @@  discard block
 block discarded – undo
2129 2129
      */
2130 2130
     private function generateChangeListQuery($lang, $offset, $prop) {
2131 2131
         $fcl = $this->generateFromClause();
2132
-        $offset = ($offset) ? 'OFFSET ' . $offset : '';
2132
+        $offset = ($offset) ? 'OFFSET '.$offset : '';
2133 2133
 
2134 2134
         $query = <<<EOQ
2135 2135
 SELECT DISTINCT ?concept ?date ?label $fcl
Please login to merge, or discard this patch.
model/LabelSkosXL.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
     public function getPrefLabel() {
12 12
         $label = null;
13 13
         $labels = $this->resource->allResources('skosxl:prefLabel');
14
-        foreach($labels as $labres) {
14
+        foreach ($labels as $labres) {
15 15
             $label = $labres->getLiteral('skosxl:literalForm');
16 16
             if ($label->getLang() == $this->clang) {
17 17
                 return $label;
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
     public function getProperties() {
24 24
         $ret = array();
25 25
         $props = $this->resource->properties();
26
-        foreach($props as $prop) {
26
+        foreach ($props as $prop) {
27 27
             if ($prop !== 'skosxl:prefLabel') {
28 28
                 $ret[$prop] = $this->resource->get($prop);
29 29
             }
Please login to merge, or discard this patch.
model/ConceptMappingPropertyValue.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
     {
37 37
         $label = $this->getLabel();
38 38
         $notation = $this->getNotation();
39
-        return $notation . $label;
39
+        return $notation.$label;
40 40
     }
41 41
 
42 42
     public function getType()
@@ -173,14 +173,14 @@  discard block
 block discarded – undo
173 173
             'from' => [
174 174
                 'memberSet' => [
175 175
                     [
176
-                        'uri' => (string) $this->source->getUri(),
176
+                        'uri' => (string)$this->source->getUri(),
177 177
                     ]
178 178
                 ]
179 179
             ],
180 180
             'to' => [
181 181
                 'memberSet' => [
182 182
                     [
183
-                        'uri' => (string) $this->getUri()
183
+                        'uri' => (string)$this->getUri()
184 184
                     ]
185 185
                 ]
186 186
             ]
@@ -189,20 +189,20 @@  discard block
 block discarded – undo
189 189
         $fromScheme = $this->vocab->getDefaultConceptScheme();
190 190
         if (isset($fromScheme)) {
191 191
             $ret['fromScheme'] = [
192
-                'uri' => (string) $fromScheme,
192
+                'uri' => (string)$fromScheme,
193 193
             ];
194 194
         }
195 195
 
196 196
         $exvocab = $this->getExvocab();
197 197
         if (isset($exvocab)) {
198 198
             $ret['toScheme'] = [
199
-                'uri' => (string) $exvocab->getDefaultConceptScheme(),
199
+                'uri' => (string)$exvocab->getDefaultConceptScheme(),
200 200
             ];
201 201
         }
202 202
 
203 203
         $notation = $this->getNotation();
204 204
         if (isset($notation)) {
205
-            $ret['to']['memberSet'][0]['notation'] = (string) $notation;
205
+            $ret['to']['memberSet'][0]['notation'] = (string)$notation;
206 206
         }
207 207
 
208 208
         $label = $this->getLabel($queryExVocabs);
Please login to merge, or discard this patch.