Completed
Pull Request — master (#803)
by Dan Michael O.
18:41
created
model/VocabularyCategory.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -10,6 +10,9 @@
 block discarded – undo
10 10
  */
11 11
 class VocabularyCategory extends DataObject
12 12
 {
13
+    /**
14
+     * @param Model $model
15
+     */
13 16
     public function __construct($model, $resource)
14 17
     {
15 18
         if (!($model instanceof Model)) {
Please login to merge, or discard this patch.
model/Request.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@
 block discarded – undo
106 106
 
107 107
     public function getRequestUri()
108 108
     {
109
-        return $this->getServerConstant('HTTP_HOST') . $this->getServerConstant('REQUEST_URI');
109
+        return $this->getServerConstant('HTTP_HOST').$this->getServerConstant('REQUEST_URI');
110 110
     }
111 111
     
112 112
     /**
Please login to merge, or discard this patch.
controller/EntityController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
         $baseurl = $this->getBaseHref();
22 22
         $vocid = $vocab->getId();
23 23
         $query = http_build_query(array('uri'=>$uri, 'format'=>$targetFormat));
24
-        $url = $baseurl . "rest/v1/$vocid/data?$query";
24
+        $url = $baseurl."rest/v1/$vocid/data?$query";
25 25
         $this->redirect303($url);
26 26
     }
27 27
     
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
         $localname = $vocab->getLocalName($uri);
33 33
         if ($localname !== $uri && $localname === urlencode($localname)) {
34 34
             // the URI can be shortened
35
-            $url = $baseurl . "$vocid/page/$localname";
35
+            $url = $baseurl."$vocid/page/$localname";
36 36
         } else {
37 37
             // must use full URI
38 38
             $query = http_build_query(array('uri'=>$uri));
39
-            $url = $baseurl . "$vocid/page/?" . $query;
39
+            $url = $baseurl."$vocid/page/?".$query;
40 40
         }
41 41
         $this->redirect303($url);
42 42
     }
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
             // guess vocabulary based on URI
57 57
             $vocab = $this->model->guessVocabularyFromURI($request->getUri());
58 58
             if ($vocab === null) {
59
-                return $this->returnError('404', 'Not Found', 'Unrecognized URI ' . $request->getUri());
59
+                return $this->returnError('404', 'Not Found', 'Unrecognized URI '.$request->getUri());
60 60
             }
61 61
             $request->setVocab($vocab->getId());
62 62
         }
Please login to merge, or discard this patch.
entity.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,5 +23,5 @@
 block discarded – undo
23 23
 
24 24
 } catch (Exception $e) {
25 25
     header("HTTP/1.0 500 Internal Server Error");
26
-    echo('ERROR: ' . $e->getMessage());
26
+    echo('ERROR: '.$e->getMessage());
27 27
 }
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
     }
15 15
     require_once 'vendor/autoload.php';
16 16
 } catch (Exception $e) {
17
-    echo "Error: " . $e->getMessage();
17
+    echo "Error: ".$e->getMessage();
18 18
     return;
19 19
 }
20 20
 
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
     // if language code missing, redirect to guessed language
33 33
     // in any case, redirect to <lang>/
34 34
     $lang = sizeof($parts) == 2 && $parts[1] !== '' ? $parts[1] : $controller->guessLanguage();
35
-    header("Location: " . $lang . "/");
35
+    header("Location: ".$lang."/");
36 36
 } else {
37 37
   if (array_key_exists($parts[1], $config->getLanguages())) { // global pages
38 38
         $request->setLang($parts[1]);
@@ -61,8 +61,8 @@  discard block
 block discarded – undo
61 61
         }
62 62
         if (sizeof($parts) == 3) { // language code missing
63 63
             $lang = $controller->guessLanguage();
64
-            $newurl = $controller->getBaseHref() . $vocab . "/" . $lang . "/";
65
-            header("Location: " . $newurl);
64
+            $newurl = $controller->getBaseHref().$vocab."/".$lang."/";
65
+            header("Location: ".$newurl);
66 66
         } else {
67 67
             if (array_key_exists($parts[2], $config->getLanguages())) {
68 68
                 $lang = $parts[2];
@@ -103,10 +103,10 @@  discard block
 block discarded – undo
103 103
                 }
104 104
             } else { // language code missing, redirect to some language version
105 105
                 $lang = $controller->guessLanguage($vocab);
106
-                $newurl = $controller->getBaseHref() . $vocab . "/" . $lang . "/" . implode('/', array_slice($parts, 2));
106
+                $newurl = $controller->getBaseHref().$vocab."/".$lang."/".implode('/', array_slice($parts, 2));
107 107
                 $qs = $request->getServerConstant('QUERY_STRING');
108 108
                 if ($qs) {
109
-                    $newurl .= "?" . $qs;
109
+                    $newurl .= "?".$qs;
110 110
                 }
111 111
                 header("Location: $newurl");
112 112
             }
Please login to merge, or discard this patch.
controller/Honeypot.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
32 32
     {
33 33
         // Encrypt the current time
34 34
         $honey_time_encrypted = $this->getEncryptedTime();
35
-        $html = '<div id="' . $honey_name . '_wrap" style="display:none;">' . "\r\n" .
36
-                    '<input name="' . $honey_name . '" type="text" value="" id="' . $honey_name . '"/>' . "\r\n" .
37
-                    '<input name="' . $honey_time . '" type="text" value="' . $honey_time_encrypted . '"/>' . "\r\n" .
35
+        $html = '<div id="'.$honey_name.'_wrap" style="display:none;">'."\r\n".
36
+                    '<input name="'.$honey_name.'" type="text" value="" id="'.$honey_name.'"/>'."\r\n".
37
+                    '<input name="'.$honey_time.'" type="text" value="'.$honey_time_encrypted.'"/>'."\r\n".
38 38
                 '</div>';
39 39
         return $html;
40 40
     }
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
         // Get the decrypted time
68 68
         $value = $this->decryptTime($value);
69 69
         // The current time should be greater than the time the form was built + the speed option
70
-        return ( is_numeric($value) && time() > ($value + $parameters[0]) );
70
+        return (is_numeric($value) && time() > ($value + $parameters[0]));
71 71
     }
72 72
     /**
73 73
      * Get encrypted time
Please login to merge, or discard this patch.
model/SkosmosTurtleParser.php 2 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -55,6 +55,7 @@
 block discarded – undo
55 55
 
56 56
     /**
57 57
      * Steps back, restoring the previous character or statement read() to the input buffer.
58
+     * @param string $chars
58 59
      */
59 60
     protected function unread($chars)
60 61
     {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
      */
22 22
     protected function peek()
23 23
     {
24
-        if(!$this->dataLength) { $this->dataLength = strlen($this->data); }
24
+        if (!$this->dataLength) { $this->dataLength = strlen($this->data); }
25 25
         if ($this->dataLength > $this->bytePos) {
26 26
             $slice = substr($this->data, $this->bytePos, 4);
27 27
             return mb_substr($slice, 0, 1, "UTF-8");
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
     {
79 79
         if ($this->bytePos - 4 > 0) {
80 80
             $slice = substr($this->data, $this->bytePos - 4, 4);
81
-            while($slice != '') {
81
+            while ($slice != '') {
82 82
                 if (!self::isWhitespace(mb_substr($slice, -1, 1, "UTF-8"))) {
83 83
                     return;
84 84
                 }
Please login to merge, or discard this patch.
model/sparql/GenericSparql.php 2 patches
Doc Comments   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
      * Returns information (as a graph) for one or more concept URIs
454 454
      * @param mixed $uris concept URI (string) or array of URIs
455 455
      * @param string|null $arrayClass the URI for thesaurus array class, or null if not used
456
-     * @param \Vocabulary[]|null $vocabs vocabularies to target
456
+     * @param Vocabulary[] $vocabs vocabularies to target
457 457
      * @return \Concept[]
458 458
      */
459 459
     public function queryConceptInfoGraph($uris, $arrayClass = null, $vocabs = array()) {
@@ -673,7 +673,7 @@  discard block
 block discarded – undo
673 673
 
674 674
     /**
675 675
      * Generate a VALUES clause for limiting the targeted graphs.
676
-     * @param Vocabulary[]|null $vocabs array of Vocabulary objects to target
676
+     * @param Vocabulary[] $vocabs array of Vocabulary objects to target
677 677
      * @return string VALUES clause, or "" if not necessary to limit
678 678
      */
679 679
     protected function formatValuesGraph($vocabs) {
@@ -853,6 +853,7 @@  discard block
 block discarded – undo
853 853
      * @param string $searchLang language code used for matching labels (null means any language)
854 854
      * @param string[] $props properties to target e.g. array('skos:prefLabel','skos:altLabel')
855 855
      * @param boolean $unique restrict results to unique concepts (default: false)
856
+     * @param string $filterGraph
856 857
      * @return string sparql query
857 858
      */
858 859
     protected function generateConceptSearchQueryInner($term, $lang, $searchLang, $props, $unique, $filterGraph)
@@ -1118,6 +1119,7 @@  discard block
 block discarded – undo
1118 1119
     /**
1119 1120
      * Generates sparql query clauses used for creating the alphabetical index.
1120 1121
      * @param string $letter the letter (or special class) to search for
1122
+     * @param string $lang
1121 1123
      * @return array of sparql query clause strings
1122 1124
      */
1123 1125
     private function formatFilterConditions($letter, $lang) {
Please login to merge, or discard this 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/Concept.php 2 patches
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -50,6 +50,7 @@  discard block
 block discarded – undo
50 50
      * @param Vocabulary $vocab
51 51
      * @param EasyRdf\Resource $resource
52 52
      * @param EasyRdf\Graph $graph
53
+     * @param string|null $clang
53 54
      */
54 55
     public function __construct($model, $vocab, $resource, $graph, $clang)
55 56
     {
@@ -526,6 +527,7 @@  discard block
 block discarded – undo
526 527
 
527 528
     /**
528 529
      * Gets the groups/arrays the concept belongs to.
530
+     * @param boolean $includeArrays
529 531
      */
530 532
     public function getReverseResources($includeArrays) {
531 533
         $groups = array();
Please login to merge, or discard this patch.
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -137,9 +137,9 @@  discard block
 block discarded – undo
137 137
                 return $this->resource->label($fallback);
138 138
             }
139 139
             // We need to check all the labels in case one of them matches a subtag of the current language
140
-            foreach($this->resource->allLiterals('skos:prefLabel') as $label) {
140
+            foreach ($this->resource->allLiterals('skos:prefLabel') as $label) {
141 141
                 // the label lang code is a subtag of the UI lang eg. en-GB - create a new literal with the main language
142
-                if ($label !== null && strpos($label->getLang(), $fallback . '-') === 0) {
142
+                if ($label !== null && strpos($label->getLang(), $fallback.'-') === 0) {
143 143
                     return EasyRdf\Literal::create($label, $fallback);
144 144
                 }
145 145
             }
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
 
161 161
     public function hasXlLabel($prop = 'prefLabel')
162 162
     {
163
-        if ($this->resource->hasProperty('skosxl:' . $prop)) {
163
+        if ($this->resource->hasProperty('skosxl:'.$prop)) {
164 164
             return true;
165 165
         }
166 166
         return false;
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
     public function getXlLabel()
170 170
     {
171 171
         $labels = $this->resource->allResources('skosxl:prefLabel');
172
-        foreach($labels as $labres) {
172
+        foreach ($labels as $labres) {
173 173
             $label = $labres->getLiteral('skosxl:literalForm');
174 174
             if ($label !== null && $label->getLang() == $this->clang) {
175 175
                 return new LabelSkosXL($this->model, $labres);
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
         // catch external subjects that have $res as object
277 277
         $extSubjects = $exGraph->resourcesMatching("schema:about", $res);
278 278
 
279
-        $propList =  array_unique(array_merge(
279
+        $propList = array_unique(array_merge(
280 280
             $this->DEFAULT_EXT_PROPERTIES,
281 281
             $this->getVocab()->getConfig()->getExtProperties(),
282 282
             $this->getVocab()->getConfig()->getPlugins()->getExtProperties()
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
      * @param string[] $seen Processed resources so far
302 302
      * @param string[] $props (optional) limit to these property URIs
303 303
      */
304
-    private function addExternalTriplesToGraph($res, &$seen, $props=null)
304
+    private function addExternalTriplesToGraph($res, &$seen, $props = null)
305 305
     {
306 306
         if (array_key_exists($res->getUri(), $seen) && $seen[$res->getUri()] === 0) {
307 307
             return;
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
      */
332 332
     private function addPropertyValues($res, $prop, &$seen)
333 333
     {
334
-        $resList = $res->allResources('<' . $prop . '>');
334
+        $resList = $res->allResources('<'.$prop.'>');
335 335
 
336 336
         foreach ($resList as $res2) {
337 337
             if ($res2->isBNode()) {
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
341 341
             $this->addResourceReifications($res, $prop, $res2, $seen);
342 342
         }
343 343
 
344
-        $litList = $res->allLiterals('<' . $prop . '>');
344
+        $litList = $res->allLiterals('<'.$prop.'>');
345 345
 
346 346
         foreach ($litList as $lit) {
347 347
             $this->graph->addLiteral($res, $prop, $lit);
@@ -512,9 +512,9 @@  discard block
 block discarded – undo
512 512
                 // if not found in current vocabulary, look up in the default graph to be able
513 513
                 // to read an ontology loaded in a separate graph
514 514
                 // note that this imply that the property has an rdf:type declared for the query to work
515
-                if(!$proplabel) {
515
+                if (!$proplabel) {
516 516
                     $envLangLabels = $this->model->getDefaultSparql()->queryLabel($longUri, $this->getEnvLang());
517
-                    $proplabel = ($envLangLabels)?$envLangLabels[$this->getEnvLang()]:$this->model->getDefaultSparql()->queryLabel($longUri, '')[''];
517
+                    $proplabel = ($envLangLabels) ? $envLangLabels[$this->getEnvLang()] : $this->model->getDefaultSparql()->queryLabel($longUri, '')[''];
518 518
                 }
519 519
 
520 520
                 // look for superproperties in the current graph
@@ -524,12 +524,12 @@  discard block
 block discarded – undo
524 524
                 }
525 525
 
526 526
                 // also look up superprops in the default graph if not found in current vocabulary
527
-                if(!$superprops || empty($superprops)) {
527
+                if (!$superprops || empty($superprops)) {
528 528
                     $superprops = $this->model->getDefaultSparql()->querySuperProperties($longUri);
529 529
                 }
530 530
 
531 531
                 // we're reading only one super property, even if there are multiple ones
532
-                $superprop = ($superprops)?$superprops[0]:null;
532
+                $superprop = ($superprops) ? $superprops[0] : null;
533 533
                 if ($superprop) {
534 534
                     $superprop = EasyRdf\RdfNamespace::shorten($superprop) ? EasyRdf\RdfNamespace::shorten($superprop) : $superprop;
535 535
                 }
@@ -541,7 +541,7 @@  discard block
 block discarded – undo
541 541
                 }
542 542
 
543 543
                 // searching for subproperties of literals too
544
-                if($superprops) {
544
+                if ($superprops) {
545 545
                     foreach ($superprops as $subi) {
546 546
                         $suburi = EasyRdf\RdfNamespace::shorten($subi) ? EasyRdf\RdfNamespace::shorten($subi) : $subi;
547 547
                         $duplicates[$suburi] = $prop;
@@ -661,14 +661,14 @@  discard block
 block discarded – undo
661 661
 
662 662
             // making a human readable string from the timestamps
663 663
             if ($created != '') {
664
-                $ret = gettext('skosmos:created') . ' ' . (Punic\Calendar::formatDate($created, 'short'));
664
+                $ret = gettext('skosmos:created').' '.(Punic\Calendar::formatDate($created, 'short'));
665 665
             }
666 666
 
667 667
             if ($modified != '') {
668 668
                 if ($created != '') {
669
-                    $ret .= ', ' . gettext('skosmos:modified') . ' ' . (Punic\Calendar::formatDate($modified, 'short'));
669
+                    $ret .= ', '.gettext('skosmos:modified').' '.(Punic\Calendar::formatDate($modified, 'short'));
670 670
                 } else {
671
-                    $ret .= ' ' . ucfirst(gettext('skosmos:modified')) . ' ' . (Punic\Calendar::formatDate($modified, 'short'));
671
+                    $ret .= ' '.ucfirst(gettext('skosmos:modified')).' '.(Punic\Calendar::formatDate($modified, 'short'));
672 672
                 }
673 673
 
674 674
             }
@@ -676,12 +676,12 @@  discard block
 block discarded – undo
676 676
             trigger_error($e->getMessage(), E_USER_WARNING);
677 677
             $ret = '';
678 678
             if ($this->resource->get('dc:modified')) {
679
-                $modified = (string) $this->resource->get('dc:modified');
680
-                $ret = gettext('skosmos:modified') . ' ' . $modified;
679
+                $modified = (string)$this->resource->get('dc:modified');
680
+                $ret = gettext('skosmos:modified').' '.$modified;
681 681
             }
682 682
             if ($this->resource->get('dc:created')) {
683
-                $created .= (string) $this->resource->get('dc:created');
684
-                $ret .= ' ' . gettext('skosmos:created') . ' ' . $created;
683
+                $created .= (string)$this->resource->get('dc:created');
684
+                $ret .= ' '.gettext('skosmos:created').' '.$created;
685 685
             }
686 686
         }
687 687
         return $ret;
@@ -791,7 +791,7 @@  discard block
 block discarded – undo
791 791
         $ret = array();
792 792
         foreach ($labels as $lit) {
793 793
             // filtering away subsets of the current language eg. en vs en-GB
794
-            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang() . '-') !== 0) {
794
+            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang().'-') !== 0) {
795 795
                 $prop = in_array($lit, $prefLabels) ? 'skos:prefLabel' : 'skos:altLabel';
796 796
                 $ret[$this->literalLanguageToString($lit)][] = new ConceptPropertyValueLiteral($this->model, $this->vocab, $this->resource, $lit, $prop);
797 797
             }
@@ -853,10 +853,10 @@  discard block
 block discarded – undo
853 853
             }
854 854
             else if ($context[$vocabPrefix] !== $vocabUriSpace) {
855 855
                 $i = 2;
856
-                while (isset($context[$vocabPrefix . $i]) && $context[$vocabPrefix . $i] !== $vocabUriSpace) {
856
+                while (isset($context[$vocabPrefix.$i]) && $context[$vocabPrefix.$i] !== $vocabUriSpace) {
857 857
                     $i += 1;
858 858
                 }
859
-                $context[$vocabPrefix . $i] = $vocabUriSpace;
859
+                $context[$vocabPrefix.$i] = $vocabUriSpace;
860 860
             }
861 861
         }
862 862
         $compactJsonLD = \ML\JsonLD\JsonLD::compact($this->graph->serialise('jsonld'), json_encode($context));
Please login to merge, or discard this patch.