Completed
Pull Request — master (#838)
by Osma
02:44
created
model/DataObject.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,10 +79,12 @@
 block discarded – undo
79 79
         if ($sortable !== null) {
80 80
             uksort($sortable, array($this, 'mycompare'));
81 81
             foreach ($sortable as $prop => $vals) {
82
-                if (is_array($prop)) // the ConceptProperty objects have their own sorting methods
82
+                if (is_array($prop)) {
83
+                  // the ConceptProperty objects have their own sorting methods
83 84
                 {
84 85
                     ksort($sortable[$prop]);
85 86
                 }
87
+                }
86 88
             }
87 89
         }
88 90
         return $sortable;
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -124,8 +124,8 @@
 block discarded – undo
124 124
      */
125 125
     public function getEnvLang()
126 126
     {
127
-       // get language from locale, same as used by gettext, set by Controller
128
-       return substr(getenv("LC_ALL"), 0, 2); // @codeCoverageIgnore
127
+        // get language from locale, same as used by gettext, set by Controller
128
+        return substr(getenv("LC_ALL"), 0, 2); // @codeCoverageIgnore
129 129
     }
130 130
 
131 131
     /**
Please login to merge, or discard this patch.
model/sparql/GenericSparql.php 4 patches
Braces   +10 added lines, -6 removed lines patch added patch discarded remove patch
@@ -46,12 +46,16 @@  discard block
 block discarded – undo
46 46
         $this->client = new EasyRdf\Sparql\Client($endpoint);
47 47
 
48 48
         // set graphClause so that it can be used by all queries
49
-        if ($this->isDefaultEndpoint()) // default endpoint; query any graph (and catch it in a variable)
49
+        if ($this->isDefaultEndpoint()) {
50
+          // default endpoint; query any graph (and catch it in a variable)
50 51
         {
51 52
             $this->graphClause = "GRAPH $graph";
52
-        } elseif ($graph) // query a specific graph
53
+        }
54
+        } elseif ($graph) {
55
+          // query a specific graph
53 56
         {
54 57
             $this->graphClause = "GRAPH <$graph>";
58
+        }
55 59
         } else // query the default graph
56 60
         {
57 61
             $this->graphClause = "";
@@ -100,8 +104,9 @@  discard block
 block discarded – undo
100 104
             }
101 105
         }
102 106
         foreach ($graphs as $graph) {
103
-            if($graph !== NULL)
104
-                $clause .= "FROM NAMED <$graph> "; 
107
+            if($graph !== NULL) {
108
+                            $clause .= "FROM NAMED <$graph> ";
109
+            }
105 110
         }
106 111
         return $clause;
107 112
     }
@@ -1847,8 +1852,7 @@  discard block
 block discarded – undo
1847 1852
         if (sizeof($ret) > 0) {
1848 1853
             // existing concept, with children
1849 1854
             return $ret;
1850
-        }
1851
-        else {
1855
+        } else {
1852 1856
             // nonexistent concept
1853 1857
             return null;
1854 1858
         }
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
      *
65 65
      * @param string $query
66 66
      * @return string
67
-    */
67
+     */
68 68
     protected function generateQueryPrefixes($query)
69 69
     {
70 70
         // Check for undefined prefixes
@@ -1809,7 +1809,7 @@  discard block
 block discarded – undo
1809 1809
 
1810 1810
     /**
1811 1811
      * Generates a sparql query for finding the hierarchy for a concept.
1812
-	 * A concept may be a top concept in multiple schemes, returned as a single whitespace-separated literal.
1812
+     * A concept may be a top concept in multiple schemes, returned as a single whitespace-separated literal.
1813 1813
      * @param string $uri concept uri.
1814 1814
      * @param string $lang
1815 1815
      * @param string $fallback language to use if label is not available in the preferred language
@@ -1886,10 +1886,10 @@  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());
1890
-               // sort to garantee an alphabetical ordering of the URI
1891
-               sort($topConceptsList);
1892
-               $ret[$uri]['tops'] = $topConceptsList;
1889
+                $topConceptsList=explode(" ", $row->tops->getValue());
1890
+                // sort to garantee an alphabetical ordering of the URI
1891
+                sort($topConceptsList);
1892
+                $ret[$uri]['tops'] = $topConceptsList;
1893 1893
             }
1894 1894
             if (isset($row->children)) {
1895 1895
                 if (!isset($ret[$uri]['narrower'])) {
Please login to merge, or discard this patch.
Doc Comments   +8 added lines, -4 removed lines patch added patch discarded remove patch
@@ -289,6 +289,7 @@  discard block
 block discarded – undo
289 289
     /**
290 290
      * Counts the number of concepts in a easyRDF graph with a specific language.
291 291
      * @param array $langs Languages to query for
292
+     * @param string[] $classes
292 293
      * @return Array containing count of concepts for each language and property.
293 294
      */
294 295
     public function countLangConcepts($langs, $classes = null) {
@@ -473,7 +474,7 @@  discard block
 block discarded – undo
473 474
      * Returns information (as a graph) for one or more concept URIs
474 475
      * @param mixed $uris concept URI (string) or array of URIs
475 476
      * @param string|null $arrayClass the URI for thesaurus array class, or null if not used
476
-     * @param \Vocabulary[]|null $vocabs vocabularies to target
477
+     * @param Vocabulary[] $vocabs vocabularies to target
477 478
      * @return \EasyRdf\Graph
478 479
      */
479 480
     public function queryConceptInfoGraph($uris, $arrayClass = null, $vocabs = array()) {
@@ -489,7 +490,7 @@  discard block
 block discarded – undo
489 490
 
490 491
     /**
491 492
      * Returns information (as an array of Concept objects) for one or more concept URIs
492
-     * @param mixed $uris concept URI (string) or array of URIs
493
+     * @param string $uris concept URI (string) or array of URIs
493 494
      * @param string|null $arrayClass the URI for thesaurus array class, or null if not used
494 495
      * @param \Vocabulary[] $vocabs vocabularies to target
495 496
      * @param string|null $clang content language
@@ -704,7 +705,7 @@  discard block
 block discarded – undo
704 705
 
705 706
     /**
706 707
      * Generate a VALUES clause for limiting the targeted graphs.
707
-     * @param Vocabulary[]|null $vocabs array of Vocabulary objects to target
708
+     * @param Vocabulary[] $vocabs array of Vocabulary objects to target
708 709
      * @return string VALUES clause, or "" if not necessary to limit
709 710
      */
710 711
     protected function formatValuesGraph($vocabs) {
@@ -884,6 +885,7 @@  discard block
 block discarded – undo
884 885
      * @param string $searchLang language code used for matching labels (null means any language)
885 886
      * @param string[] $props properties to target e.g. array('skos:prefLabel','skos:altLabel')
886 887
      * @param boolean $unique restrict results to unique concepts (default: false)
888
+     * @param string $filterGraph
887 889
      * @return string sparql query
888 890
      */
889 891
     protected function generateConceptSearchQueryInner($term, $lang, $searchLang, $props, $unique, $filterGraph)
@@ -1158,6 +1160,7 @@  discard block
 block discarded – undo
1158 1160
     /**
1159 1161
      * Generates sparql query clauses used for creating the alphabetical index.
1160 1162
      * @param string $letter the letter (or special class) to search for
1163
+     * @param string $lang
1161 1164
      * @return array of sparql query clause strings
1162 1165
      */
1163 1166
     private function formatFilterConditions($letter, $lang) {
@@ -1325,6 +1328,7 @@  discard block
 block discarded – undo
1325 1328
     /**
1326 1329
      * Query for the first characters (letter or otherwise) of the labels in the particular language.
1327 1330
      * @param string $lang language
1331
+     * @param string[] $classes
1328 1332
      * @return array array of characters
1329 1333
      */
1330 1334
     public function queryFirstCharacters($lang, $classes = null) {
@@ -1647,7 +1651,7 @@  discard block
 block discarded – undo
1647 1651
     /**
1648 1652
      * Query a single transitive property of a concept.
1649 1653
      * @param string $uri
1650
-     * @param array $props the property/properties.
1654
+     * @param string[] $props the property/properties.
1651 1655
      * @param string $lang
1652 1656
      * @param string $fallbacklang language to use if label is not available in the preferred language
1653 1657
      * @param integer $limit
Please login to merge, or discard this patch.
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -96,11 +96,11 @@  discard block
 block discarded – undo
96 96
     private function performQuery($query) {
97 97
         $queryId = sprintf("%05d", rand(0, 99999));
98 98
         $logger = $this->model->getLogger();
99
-        $logger->info("[qid $queryId] SPARQL query:\n" . $this->generateQueryPrefixes($query) . "\n$query\n");
99
+        $logger->info("[qid $queryId] SPARQL query:\n".$this->generateQueryPrefixes($query)."\n$query\n");
100 100
         $starttime = microtime(true);
101 101
         $result = $this->client->query($query);
102 102
         $elapsed = intval(round((microtime(true) - $starttime) * 1000));
103
-        if(method_exists($result, 'numRows')) {
103
+        if (method_exists($result, 'numRows')) {
104 104
             $numRows = $result->numRows();
105 105
             $logger->info("[qid $queryId] result: $numRows rows returned in $elapsed ms");
106 106
         } else { // graph result
@@ -136,20 +136,20 @@  discard block
 block discarded – undo
136 136
      * @param Vocabulary[]|null $vocabs
137 137
      * @return string
138 138
      */
139
-    protected function generateFromClause($vocabs=null) {
139
+    protected function generateFromClause($vocabs = null) {
140 140
         $graphs = array();
141 141
         $clause = '';
142 142
         if (!$vocabs) {
143 143
             return $this->graph !== '?graph' && $this->graph !== NULL ? "FROM <$this->graph>" : '';
144 144
         }
145
-        foreach($vocabs as $vocab) {
145
+        foreach ($vocabs as $vocab) {
146 146
             $graph = $vocab->getGraph();
147 147
             if (!in_array($graph, $graphs)) {
148 148
                 array_push($graphs, $graph);
149 149
             }
150 150
         }
151 151
         foreach ($graphs as $graph) {
152
-            if($graph !== NULL)
152
+            if ($graph !== NULL)
153 153
                 $clause .= "FROM NAMED <$graph> "; 
154 154
         }
155 155
         return $clause;
@@ -693,9 +693,9 @@  discard block
 block discarded – undo
693 693
                 $conceptscheme['title'] = $row->title->getValue();
694 694
             }
695 695
             // add dct:subject and their labels in the result
696
-            if(isset($row->domain) && isset($row->domainLabel)){
697
-                $conceptscheme['subject']['uri']=$row->domain->getURI();
698
-                $conceptscheme['subject']['prefLabel']=$row->domainLabel->getValue();
696
+            if (isset($row->domain) && isset($row->domainLabel)) {
697
+                $conceptscheme['subject']['uri'] = $row->domain->getURI();
698
+                $conceptscheme['subject']['prefLabel'] = $row->domainLabel->getValue();
699 699
             }
700 700
 
701 701
             $ret[$row->cs->getURI()] = $conceptscheme;
@@ -758,7 +758,7 @@  discard block
 block discarded – undo
758 758
         foreach ($graphs as $graph) {
759 759
           $values[] = "<$graph>";
760 760
         }
761
-        return "FILTER (?graph IN (" . implode(',', $values) . "))";
761
+        return "FILTER (?graph IN (".implode(',', $values)."))";
762 762
     }
763 763
 
764 764
     /**
@@ -768,16 +768,16 @@  discard block
 block discarded – undo
768 768
      * @return string sparql query clauses
769 769
      */
770 770
     protected function formatLimitAndOffset($limit, $offset) {
771
-        $limit = ($limit) ? 'LIMIT ' . $limit : '';
772
-        $offset = ($offset) ? 'OFFSET ' . $offset : '';
771
+        $limit = ($limit) ? 'LIMIT '.$limit : '';
772
+        $offset = ($offset) ? 'OFFSET '.$offset : '';
773 773
         // eliminating whitespace and line changes when the conditions aren't needed.
774 774
         $limitandoffset = '';
775 775
         if ($limit && $offset) {
776
-            $limitandoffset = "\n" . $limit . "\n" . $offset;
776
+            $limitandoffset = "\n".$limit."\n".$offset;
777 777
         } elseif ($limit) {
778
-            $limitandoffset = "\n" . $limit;
778
+            $limitandoffset = "\n".$limit;
779 779
         } elseif ($offset) {
780
-            $limitandoffset = "\n" . $offset;
780
+            $limitandoffset = "\n".$offset;
781 781
         }
782 782
 
783 783
         return $limitandoffset;
@@ -929,14 +929,14 @@  discard block
 block discarded – undo
929 929
         // if search language and UI/display language differ, must also consider case where there is no prefLabel in
930 930
         // the display language; in that case, should use the label with the same language as the matched label
931 931
         $labelcondFallback = ($searchLang != $lang) ?
932
-          "OPTIONAL { # in case previous OPTIONAL block gives no labels\n" .
932
+          "OPTIONAL { # in case previous OPTIONAL block gives no labels\n".
933 933
           "?s skos:prefLabel ?label . FILTER (LANGMATCHES(LANG(?label), LANG(?match))) }" : "";
934 934
           
935 935
         //  Including the labels if there is no query term given.
936 936
         if ($rawterm === '') {
937 937
           $labelClause = "?s skos:prefLabel ?label .";
938
-          $labelClause = ($lang) ? $labelClause . " FILTER (LANGMATCHES(LANG(?label), '$lang'))" : $labelClause . "";
939
-          return $labelClause . " BIND(?label AS ?match)";
938
+          $labelClause = ($lang) ? $labelClause." FILTER (LANGMATCHES(LANG(?label), '$lang'))" : $labelClause."";
939
+          return $labelClause." BIND(?label AS ?match)";
940 940
         }
941 941
 
942 942
         /*
@@ -1000,20 +1000,20 @@  discard block
 block discarded – undo
1000 1000
         $schemecond = '';
1001 1001
         if (!empty($schemes)) {
1002 1002
             $conditions = array();
1003
-            foreach($schemes as $scheme) {
1003
+            foreach ($schemes as $scheme) {
1004 1004
                 $conditions[] = "{?s skos:inScheme <$scheme>}";
1005 1005
             }
1006
-            $schemecond = '{'.implode(" UNION ",$conditions).'}';
1006
+            $schemecond = '{'.implode(" UNION ", $conditions).'}';
1007 1007
         }
1008
-        $filterDeprecated="";
1008
+        $filterDeprecated = "";
1009 1009
         //show or hide deprecated concepts
1010
-        if(!$showDeprecated){
1011
-            $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }";
1010
+        if (!$showDeprecated) {
1011
+            $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
1012 1012
         }
1013 1013
         // extra conditions for parent and group, if specified
1014
-        $parentcond = ($params->getParentLimit()) ? "?s skos:broader+ <" . $params->getParentLimit() . "> ." : "";
1015
-        $groupcond = ($params->getGroupLimit()) ? "<" . $params->getGroupLimit() . "> skos:member ?s ." : "";
1016
-        $pgcond = $parentcond . $groupcond;
1014
+        $parentcond = ($params->getParentLimit()) ? "?s skos:broader+ <".$params->getParentLimit()."> ." : "";
1015
+        $groupcond = ($params->getGroupLimit()) ? "<".$params->getGroupLimit()."> skos:member ?s ." : "";
1016
+        $pgcond = $parentcond.$groupcond;
1017 1017
 
1018 1018
         $orderextra = $this->isDefaultEndpoint() ? $this->graph : '';
1019 1019
 
@@ -1086,9 +1086,9 @@  discard block
 block discarded – undo
1086 1086
             $hit['type'][] = $this->shortenUri($typeuri);
1087 1087
         }
1088 1088
 
1089
-        if(!empty($fields)) {
1089
+        if (!empty($fields)) {
1090 1090
             foreach ($fields as $prop) {
1091
-                $propname = $prop . 's';
1091
+                $propname = $prop.'s';
1092 1092
                 if (isset($row->$propname)) {
1093 1093
                     foreach (explode("\n", $row->$propname->getValue()) as $line) {
1094 1094
                         $rdata = str_getcsv($line, ',', '"', '"');
@@ -1103,7 +1103,7 @@  discard block
 block discarded – undo
1103 1103
                             $propvals = $rdata[2];
1104 1104
                         }
1105 1105
 
1106
-                        $hit['skos:' . $prop][] = $propvals;
1106
+                        $hit['skos:'.$prop][] = $propvals;
1107 1107
                     }
1108 1108
                 }
1109 1109
             }
@@ -1179,7 +1179,7 @@  discard block
 block discarded – undo
1179 1179
      * @return array query result object
1180 1180
      */
1181 1181
     public function queryConcepts($vocabs, $fields = null, $unique = false, $params, $showDeprecated = false) {
1182
-        $query = $this->generateConceptSearchQuery($fields, $unique, $params,$showDeprecated);
1182
+        $query = $this->generateConceptSearchQuery($fields, $unique, $params, $showDeprecated);
1183 1183
         $results = $this->query($query);
1184 1184
         return $this->transformConceptSearchResults($results, $vocabs, $fields);
1185 1185
     }
@@ -1233,9 +1233,9 @@  discard block
 block discarded – undo
1233 1233
         $conditions = $this->formatFilterConditions($letter, $lang);
1234 1234
         $filtercondLabel = $conditions['filterpref'];
1235 1235
         $filtercondALabel = $conditions['filteralt'];
1236
-        $filterDeprecated="";
1237
-        if(!$showDeprecated){
1238
-            $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }";
1236
+        $filterDeprecated = "";
1237
+        if (!$showDeprecated) {
1238
+            $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
1239 1239
         }
1240 1240
         $query = <<<EOQ
1241 1241
 SELECT DISTINCT ?s ?label ?alabel $fcl
@@ -1311,8 +1311,8 @@  discard block
 block discarded – undo
1311 1311
      * @param array $classes
1312 1312
      * @param boolean $showDeprecated whether to include deprecated concepts in the result (default: false)
1313 1313
      */
1314
-    public function queryConceptsAlphabetical($letter, $lang, $limit = null, $offset = null, $classes = null,$showDeprecated = false) {
1315
-        $query = $this->generateAlphabeticalListQuery($letter, $lang, $limit, $offset, $classes,$showDeprecated);
1314
+    public function queryConceptsAlphabetical($letter, $lang, $limit = null, $offset = null, $classes = null, $showDeprecated = false) {
1315
+        $query = $this->generateAlphabeticalListQuery($letter, $lang, $limit, $offset, $classes, $showDeprecated);
1316 1316
         $results = $this->query($query);
1317 1317
         return $this->transformAlphabeticalListResults($results);
1318 1318
     }
@@ -1646,7 +1646,7 @@  discard block
 block discarded – undo
1646 1646
                 if (!isset($row->label) || $row->label->getLang() === $lang) {
1647 1647
                     $ret[$row->object->getUri()] = $val;
1648 1648
                 } elseif ($row->label->getLang() === $fallbacklang) {
1649
-                    $val['label'] .= ' (' . $row->label->getLang() . ')';
1649
+                    $val['label'] .= ' ('.$row->label->getLang().')';
1650 1650
                     $ret[$row->object->getUri()] = $val;
1651 1651
                 }
1652 1652
             }
@@ -1742,10 +1742,10 @@  discard block
 block discarded – undo
1742 1742
 
1743 1743
             $label = null;
1744 1744
             if (isset($row->label)) {
1745
-                if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang . "-") == 0) {
1745
+                if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang."-") == 0) {
1746 1746
                     $label = $row->label->getValue();
1747 1747
                 } else {
1748
-                    $label = $row->label->getValue() . " (" . $row->label->getLang() . ")";
1748
+                    $label = $row->label->getValue()." (".$row->label->getLang().")";
1749 1749
                 }
1750 1750
 
1751 1751
             }
@@ -1821,8 +1821,8 @@  discard block
 block discarded – undo
1821 1821
         foreach ($result as $row) {
1822 1822
             if (isset($row->top) && isset($row->label)) {
1823 1823
                 $label = $row->label->getValue();
1824
-                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang . "-") !== 0) {
1825
-                    $label .= ' (' . $row->label->getLang() . ')';
1824
+                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang."-") !== 0) {
1825
+                    $label .= ' ('.$row->label->getLang().')';
1826 1826
                 }
1827 1827
                 $top = array('uri' => $row->top->getUri(), 'topConceptOf' => $row->topuri->getUri(), 'label' => $label, 'hasChildren' => filter_var($row->children->getValue(), FILTER_VALIDATE_BOOLEAN));
1828 1828
                 if (isset($row->notation)) {
@@ -1915,7 +1915,7 @@  discard block
 block discarded – undo
1915 1915
                 $ret[$uri]['exact'] = $row->exact->getUri();
1916 1916
             }
1917 1917
             if (isset($row->tops)) {
1918
-               $topConceptsList=explode(" ", $row->tops->getValue());
1918
+               $topConceptsList = explode(" ", $row->tops->getValue());
1919 1919
                // sort to garantee an alphabetical ordering of the URI
1920 1920
                sort($topConceptsList);
1921 1921
                $ret[$uri]['tops'] = $topConceptsList;
@@ -1928,8 +1928,8 @@  discard block
 block discarded – undo
1928 1928
                 $label = null;
1929 1929
                 if (isset($row->childlabel)) {
1930 1930
                     $label = $row->childlabel->getValue();
1931
-                    if ($row->childlabel->getLang() !== $lang && strpos($row->childlabel->getLang(), $lang . "-") !== 0) {
1932
-                        $label .= " (" . $row->childlabel->getLang() . ")";
1931
+                    if ($row->childlabel->getLang() !== $lang && strpos($row->childlabel->getLang(), $lang."-") !== 0) {
1932
+                        $label .= " (".$row->childlabel->getLang().")";
1933 1933
                     }
1934 1934
 
1935 1935
                 }
@@ -1950,8 +1950,8 @@  discard block
 block discarded – undo
1950 1950
             }
1951 1951
             if (isset($row->label)) {
1952 1952
                 $preflabel = $row->label->getValue();
1953
-                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang . "-") !== 0) {
1954
-                    $preflabel .= ' (' . $row->label->getLang() . ')';
1953
+                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang."-") !== 0) {
1954
+                    $preflabel .= ' ('.$row->label->getLang().')';
1955 1955
                 }
1956 1956
 
1957 1957
                 $ret[$uri]['prefLabel'] = $preflabel;
@@ -2072,9 +2072,9 @@  discard block
 block discarded – undo
2072 2072
      */
2073 2073
     private function generateConceptGroupContentsQuery($groupClass, $group, $lang, $showDeprecated = false) {
2074 2074
         $fcl = $this->generateFromClause();
2075
-        $filterDeprecated="";
2076
-        if(!$showDeprecated){
2077
-            $filterDeprecated="  FILTER NOT EXISTS { ?conc owl:deprecated true }";
2075
+        $filterDeprecated = "";
2076
+        if (!$showDeprecated) {
2077
+            $filterDeprecated = "  FILTER NOT EXISTS { ?conc owl:deprecated true }";
2078 2078
         }
2079 2079
         $query = <<<EOQ
2080 2080
 SELECT ?conc ?super ?label ?members ?type ?notation $fcl
@@ -2113,10 +2113,10 @@  discard block
 block discarded – undo
2113 2113
                     'type' => array($row->type->shorten()),
2114 2114
                 );
2115 2115
                 if (isset($row->label)) {
2116
-                    if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang . "-") == 0) {
2116
+                    if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang."-") == 0) {
2117 2117
                         $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue();
2118 2118
                     } else {
2119
-                        $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue() . " (" . $row->label->getLang() . ")";
2119
+                        $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue()." (".$row->label->getLang().")";
2120 2120
                     }
2121 2121
 
2122 2122
                 }
@@ -2144,8 +2144,8 @@  discard block
 block discarded – undo
2144 2144
      * @param boolean $showDeprecated whether to include deprecated concepts in search results
2145 2145
      * @return array Result array with concept URI as key and concept label as value
2146 2146
      */
2147
-    public function listConceptGroupContents($groupClass, $group, $lang,$showDeprecated = false) {
2148
-        $query = $this->generateConceptGroupContentsQuery($groupClass, $group, $lang,$showDeprecated);
2147
+    public function listConceptGroupContents($groupClass, $group, $lang, $showDeprecated = false) {
2148
+        $query = $this->generateConceptGroupContentsQuery($groupClass, $group, $lang, $showDeprecated);
2149 2149
         $result = $this->query($query);
2150 2150
         return $this->transformConceptGroupContentsResults($result, $lang);
2151 2151
     }
@@ -2158,7 +2158,7 @@  discard block
 block discarded – undo
2158 2158
      */
2159 2159
     private function generateChangeListQuery($lang, $offset, $prop) {
2160 2160
         $fcl = $this->generateFromClause();
2161
-        $offset = ($offset) ? 'OFFSET ' . $offset : '';
2161
+        $offset = ($offset) ? 'OFFSET '.$offset : '';
2162 2162
 
2163 2163
         $query = <<<EOQ
2164 2164
 SELECT DISTINCT ?concept ?date ?label $fcl
Please login to merge, or discard this patch.
model/sparql/JenaTextSparql.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
         // 1. Ensure characters with special meaning in Lucene are escaped
41 41
         $lucenemap = array();
42 42
         foreach (str_split(self::LUCENE_ESCAPE_CHARS) as $char) {
43
-            $lucenemap[$char] = '\\' . $char; // escape with a backslash
43
+            $lucenemap[$char] = '\\'.$char; // escape with a backslash
44 44
         }
45 45
         $term = strtr($term, $lucenemap);
46 46
 
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
      * @return string sparql order by clause
83 83
      */
84 84
     private function formatOrderBy($expression, $lang) {
85
-        if(!$this->model->getConfig()->getCollationEnabled()) {
85
+        if (!$this->model->getConfig()->getCollationEnabled()) {
86 86
             return $expression;
87 87
         }
88 88
         $orderby = sprintf('arq:collation(\'%2$s\', %1$s)', $expression, $lang);
@@ -114,13 +114,13 @@  discard block
 block discarded – undo
114 114
 
115 115
         # make text query clause
116 116
         $lcletter = mb_strtolower($letter, 'UTF-8'); // convert to lower case, UTF-8 safe
117
-        $textcondPref = $this->createTextQueryCondition($letter . '*', 'skos:prefLabel', $lang);
118
-        $textcondAlt = $this->createTextQueryCondition($letter . '*', 'skos:altLabel', $lang);
117
+        $textcondPref = $this->createTextQueryCondition($letter.'*', 'skos:prefLabel', $lang);
118
+        $textcondAlt = $this->createTextQueryCondition($letter.'*', 'skos:altLabel', $lang);
119 119
         $orderbyclause = $this->formatOrderBy("LCASE(?match)", $lang);
120 120
 
121
-        $filterDeprecated="";
122
-        if(!$showDeprecated){
123
-            $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }";
121
+        $filterDeprecated = "";
122
+        if (!$showDeprecated) {
123
+            $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
124 124
         }
125 125
         
126 126
         $query = <<<EOQ
Please login to merge, or discard this patch.
model/LabelSkosXL.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -3,6 +3,9 @@
 block discarded – undo
3 3
 class LabelSkosXL extends DataObject
4 4
 {
5 5
 
6
+    /**
7
+     * @param Model $model
8
+     */
6 9
     public function __construct($model, $resource)
7 10
     {
8 11
         parent::__construct($model, $resource);
Please login to merge, or discard this 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/ConceptPropertyValueLiteral.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
                 return Punic\Calendar::formatDate($val, 'short');
50 50
             } catch (Exception $e) {
51 51
                 trigger_error($e->getMessage(), E_USER_WARNING);
52
-                return (string) $this->literal;
52
+                return (string)$this->literal;
53 53
             }
54 54
         }
55 55
         return $this->literal->getValue();
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
         $resources = $graph->resourcesMatching('skosxl:literalForm', $this->literal);
81 81
         foreach ($resources as $xlres) {
82 82
             foreach ($xlres->properties() as $prop) {
83
-                foreach($graph->allLiterals($xlres, $prop) as $val) {
83
+                foreach ($graph->allLiterals($xlres, $prop) as $val) {
84 84
                     if ($prop !== 'rdf:type') {
85 85
                         $ret[$prop] = $val;
86 86
                     }
Please login to merge, or discard this patch.
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -10,6 +10,11 @@
 block discarded – undo
10 10
     /** property type */
11 11
     private $type;
12 12
 
13
+    /**
14
+     * @param Model $model
15
+     * @param Vocabulary $vocab
16
+     * @param EasyRdf\Resource $resource
17
+     */
13 18
     public function __construct($model, $vocab, $resource, $literal, $prop)
14 19
     {
15 20
         parent::__construct($model, $vocab, $resource);
Please login to merge, or discard this patch.
model/ConceptSearchParameters.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@
 block discarded – undo
75 75
         if ($this->rest) {
76 76
             return $term;
77 77
         }
78
-        return strpos($term, "*") === false ? $term . "*" : $term; // default to prefix search
78
+        return strpos($term, "*") === false ? $term."*" : $term; // default to prefix search
79 79
     }
80 80
 
81 81
     public function getContentLang()
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -69,8 +69,9 @@
 block discarded – undo
69 69
     public function getSearchTerm()
70 70
     {
71 71
         $term = $this->request->getQueryParamRaw('q') ? $this->request->getQueryParamRaw('q') : $this->request->getQueryParamRaw('query');
72
-        if (!$term && $this->rest)
73
-            $term = $this->request->getQueryParamRaw('label');
72
+        if (!$term && $this->rest) {
73
+                    $term = $this->request->getQueryParamRaw('label');
74
+        }
74 75
         $term = trim($term); // surrounding whitespace is not considered significant
75 76
         if ($this->rest) {
76 77
             return $term;
Please login to merge, or discard this patch.
controller/RestController.php 3 patches
Braces   +18 added lines, -6 removed lines patch added patch discarded remove patch
@@ -400,7 +400,9 @@  discard block
 block discarded – undo
400 400
                 $hits[] = $res;
401 401
             }
402 402
         }
403
-        if (sizeof($hits) > 0) return $hits;
403
+        if (sizeof($hits) > 0) {
404
+          return $hits;
405
+        }
404 406
 
405 407
         // case 2: case-insensitive match on preferred label
406 408
         foreach ($results as $res) {
@@ -408,7 +410,9 @@  discard block
 block discarded – undo
408 410
                 $hits[] = $res;
409 411
             }
410 412
         }
411
-        if (sizeof($hits) > 0) return $hits;
413
+        if (sizeof($hits) > 0) {
414
+          return $hits;
415
+        }
412 416
 
413 417
         if ($lang === null) {
414 418
             // case 1A: exact match on preferred label in any language
@@ -419,7 +423,9 @@  discard block
 block discarded – undo
419 423
                     $hits[] = $res;
420 424
                 }
421 425
             }
422
-            if (sizeof($hits) > 0) return $hits;
426
+            if (sizeof($hits) > 0) {
427
+              return $hits;
428
+            }
423 429
 
424 430
             // case 2A: case-insensitive match on preferred label in any language
425 431
             foreach ($results as $res) {
@@ -429,7 +435,9 @@  discard block
 block discarded – undo
429 435
                     $hits[] = $res;
430 436
                 }
431 437
             }
432
-            if (sizeof($hits) > 0) return $hits;
438
+            if (sizeof($hits) > 0) {
439
+              return $hits;
440
+            }
433 441
         }
434 442
 
435 443
         // case 3: exact match on alternate label
@@ -438,7 +446,9 @@  discard block
 block discarded – undo
438 446
                 $hits[] = $res;
439 447
             }
440 448
         }
441
-        if (sizeof($hits) > 0) return $hits;
449
+        if (sizeof($hits) > 0) {
450
+          return $hits;
451
+        }
442 452
 
443 453
 
444 454
         // case 4: case-insensitive match on alternate label
@@ -447,7 +457,9 @@  discard block
 block discarded – undo
447 457
                 $hits[] = $res;
448 458
             }
449 459
         }
450
-        if (sizeof($hits) > 0) return $hits;
460
+        if (sizeof($hits) > 0) {
461
+          return $hits;
462
+        }
451 463
 
452 464
         return $hits;
453 465
     }
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
         // wrap with JSONP callback if requested
26 26
         if (filter_input(INPUT_GET, 'callback', FILTER_SANITIZE_STRING)) {
27 27
             header("Content-type: application/javascript; charset=utf-8");
28
-            echo filter_input(INPUT_GET, 'callback', FILTER_UNSAFE_RAW) . "(" . json_encode($data) . ");";
28
+            echo filter_input(INPUT_GET, 'callback', FILTER_UNSAFE_RAW)."(".json_encode($data).");";
29 29
             return;
30 30
         }
31 31
 
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
                 'vocabularies' => 'onki:hasVocabulary',
89 89
                 'id' => 'onki:vocabularyIdentifier',
90 90
                 'uri' => '@id',
91
-                '@base' => $this->getBaseHref() . "rest/v1/vocabularies",
91
+                '@base' => $this->getBaseHref()."rest/v1/vocabularies",
92 92
             ),
93 93
             'uri' => '',
94 94
             'vocabularies' => $results,
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
         // convert to vocids array to support multi-vocabulary search
106 106
         $vocids = ($vocabs !== null && $vocabs !== '') ? explode(' ', $vocabs) : array();
107 107
         $vocabObjects = array();
108
-        foreach($vocids as $vocid) {
108
+        foreach ($vocids as $vocid) {
109 109
             $vocabObjects[] = $this->model->getVocabulary($vocid);
110 110
         }
111 111
         $parameters->setVocabularies($vocabObjects);
@@ -136,12 +136,12 @@  discard block
 block discarded – undo
136 136
         foreach ($parameters->getAdditionalFields() as $field) {
137 137
 
138 138
             // Quick-and-dirty compactification
139
-            $context[$field] = 'skos:' . $field;
139
+            $context[$field] = 'skos:'.$field;
140 140
             foreach ($results as &$result) {
141 141
                 foreach ($result as $k => $v) {
142
-                    if ($k == 'skos:' . $field) {
142
+                    if ($k == 'skos:'.$field) {
143 143
                         $result[$field] = $v;
144
-                        unset($result['skos:' . $field]);
144
+                        unset($result['skos:'.$field]);
145 145
                     }
146 146
                 }
147 147
             }
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
         if ($request->getQueryParam('labellang')) {
161 161
             $ret['@context']['@language'] = $request->getQueryParam('labellang');
162 162
         } elseif ($request->getQueryParam('lang')) {
163
-            $ret['@context']['@language'] = $request->getQueryParam('lang');;
163
+            $ret['@context']['@language'] = $request->getQueryParam('lang'); ;
164 164
         }
165 165
         return $ret;
166 166
     }
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
                 'prefLabel' => 'skos:prefLabel',
228 228
                 'title' => 'dct:title',
229 229
                 '@language' => $request->getLang(),
230
-                '@base' => $this->getBaseHref() . "rest/v1/" . $vocab->getId() . "/",
230
+                '@base' => $this->getBaseHref()."rest/v1/".$vocab->getId()."/",
231 231
             ),
232 232
             'uri' => '',
233 233
             'id' => $vocab->getId(),
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
                 'subTypes' => array('@id' => 'void:class', '@type' => '@id'),
278 278
                 'count' => 'void:entities',
279 279
                 '@language' => $request->getLang(),
280
-                '@base' => $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/",
280
+                '@base' => $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/",
281 281
             ),
282 282
             'uri' => '',
283 283
             'id' => $request->getVocab()->getId(),
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
                 'language' => 'void-ext:language',
352 352
                 'properties' => 'void:propertyPartition',
353 353
                 'labels' => 'void:triples',
354
-                '@base' => $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/",
354
+                '@base' => $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/",
355 355
             ),
356 356
             'uri' => '',
357 357
             'id' => $request->getVocab()->getId(),
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
             $types[] = $type;
389 389
         }
390 390
 
391
-        $base = $request->getVocab() ? $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/" : $this->getBaseHref() . "rest/v1/";
391
+        $base = $request->getVocab() ? $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/" : $this->getBaseHref()."rest/v1/";
392 392
 
393 393
         $ret = array_merge_recursive($this->context, array(
394 394
             '@context' => array(
@@ -548,10 +548,10 @@  discard block
 block discarded – undo
548 548
 
549 549
         $format = $this->negotiateFormat(array_keys($urls), $request->getServerConstant('HTTP_ACCEPT'), $request->getQueryParam('format'));
550 550
         if (!$format) {
551
-            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: " . implode(' ', array_keys($urls)));
551
+            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: ".implode(' ', array_keys($urls)));
552 552
         }
553 553
 
554
-        header("Location: " . $urls[$format]);
554
+        header("Location: ".$urls[$format]);
555 555
     }
556 556
 
557 557
     private function returnDataResults($results, $format) {
@@ -610,7 +610,7 @@  discard block
 block discarded – undo
610 610
 
611 611
         $format = $this->negotiateFormat(explode(' ', self::SUPPORTED_FORMATS), $request->getServerConstant('HTTP_ACCEPT'), $request->getQueryParam('format'));
612 612
         if (!$format) {
613
-            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: " . self::SUPPORTED_FORMATS);
613
+            return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: ".self::SUPPORTED_FORMATS);
614 614
         }
615 615
 
616 616
         $vocid = $vocab ? $vocab->getId() : null;
@@ -770,7 +770,7 @@  discard block
 block discarded – undo
770 770
                         }
771 771
                     }
772 772
                     // if the main concept scheme was not found, set 'top' to the first 'tops' (sorted alphabetically on the URIs)
773
-                    if (! isset($results[$uri]['top'])) {
773
+                    if (!isset($results[$uri]['top'])) {
774 774
                         $results[$uri]['top'] = $results[$uri]['tops'][0];
775 775
                     }
776 776
                 } else {
Please login to merge, or discard this patch.
Doc Comments   +34 added lines patch added patch discarded remove patch
@@ -97,6 +97,9 @@  discard block
 block discarded – undo
97 97
         return $this->returnJson($ret);
98 98
     }
99 99
 
100
+    /**
101
+     * @param Request $request
102
+     */
100 103
     private function constructSearchParameters($request)
101 104
     {
102 105
         $parameters = new ConceptSearchParameters($request, $this->model->getConfig(), true);
@@ -112,6 +115,10 @@  discard block
 block discarded – undo
112 115
         return $parameters;
113 116
     }
114 117
 
118
+    /**
119
+     * @param Request $request
120
+     * @param ConceptSearchParameters $parameters
121
+     */
115 122
     private function transformSearchResults($request, $results, $parameters)
116 123
     {
117 124
         // before serializing to JSON, get rid of the Vocabulary object that came with each resource
@@ -408,6 +415,10 @@  discard block
 block discarded – undo
408 415
         return $this->returnJson($ret);
409 416
     }
410 417
 
418
+    /**
419
+     * @param string $label
420
+     * @param string $lang
421
+     */
411 422
     private function findLookupHits($results, $label, $lang)
412 423
     {
413 424
         $hits = array();
@@ -469,6 +480,9 @@  discard block
 block discarded – undo
469 480
         return $hits;
470 481
     }
471 482
 
483
+    /**
484
+     * @param string $lang
485
+     */
472 486
     private function transformLookupResults($lang, $hits)
473 487
     {
474 488
         if (sizeof($hits) == 0) {
@@ -540,6 +554,9 @@  discard block
 block discarded – undo
540 554
         return $this->returnJson($ret);
541 555
     }
542 556
 
557
+    /**
558
+     * @param Request $request
559
+     */
543 560
     private function redirectToVocabData($request) {
544 561
         $urls = $request->getVocab()->getConfig()->getDataURLs();
545 562
         if (sizeof($urls) == 0) {
@@ -555,6 +572,9 @@  discard block
 block discarded – undo
555 572
         header("Location: " . $urls[$format]);
556 573
     }
557 574
 
575
+    /**
576
+     * @param string $format
577
+     */
558 578
     private function returnDataResults($results, $format) {
559 579
         if ($format == 'application/ld+json' || $format == 'application/json') {
560 580
             // further compact JSON-LD document using a context
@@ -650,6 +670,12 @@  discard block
 block discarded – undo
650 670
         return $this->returnJson($ret);
651 671
     }
652 672
 
673
+    /**
674
+     * @param string $uri
675
+     * @param string $lang
676
+     * @param string $propname
677
+     * @param string $propuri
678
+     */
653 679
     private function transformPropertyResults($uri, $lang, $objects, $propname, $propuri)
654 680
     {
655 681
         $results = array();
@@ -665,6 +691,14 @@  discard block
 block discarded – undo
665 691
         return $ret;
666 692
     }
667 693
 
694
+    /**
695
+     * @param string $uri
696
+     * @param string $lang
697
+     * @param string $tpropname
698
+     * @param string $tpropuri
699
+     * @param string $dpropname
700
+     * @param string $dpropuri
701
+     */
668 702
     private function transformTransitivePropertyResults($uri, $lang, $objects, $tpropname, $tpropuri, $dpropname, $dpropuri)
669 703
     {
670 704
         $results = array();
Please login to merge, or discard this patch.
model/PluginRegister.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 class PluginRegister {
4 4
     private $requestedPlugins;
5 5
 
6
-    public function __construct($requestedPlugins=array()) {
6
+    public function __construct($requestedPlugins = array()) {
7 7
         $this->requestedPlugins = $requestedPlugins;
8 8
     }
9 9
 
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
      * @param boolean $raw interpret $type values as raw text instead of files
32 32
      * @return array
33 33
      */
34
-    private function filterPlugins($type, $raw=false) {
34
+    private function filterPlugins($type, $raw = false) {
35 35
         $plugins = $this->getPlugins();
36 36
         $ret = array();
37 37
         if (!empty($plugins)) {
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
                     }
44 44
                     else {
45 45
                         foreach ($files[$type] as $file) {
46
-                            array_push($ret[$name], 'plugins/' . $name . '/' . $file);
46
+                            array_push($ret[$name], 'plugins/'.$name.'/'.$file);
47 47
                         }
48 48
                     }
49 49
                 }
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
      * @param array $names the plugin name strings (foldernames) in an array
75 75
      * @return array
76 76
      */
77
-    public function getPluginsJS($names=null) {
77
+    public function getPluginsJS($names = null) {
78 78
         if ($names) {
79 79
             $names = array_merge($this->requestedPlugins, $names);
80 80
             return $this->filterPluginsByName('js', $names);
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
      * @param array $names the plugin name strings (foldernames) in an array
88 88
      * @return array
89 89
      */
90
-    public function getPluginsCSS($names=null) {
90
+    public function getPluginsCSS($names = null) {
91 91
         if ($names) {
92 92
             $names = array_merge($this->requestedPlugins, $names);
93 93
             return $this->filterPluginsByName('css', $names);
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
      * @param array $names the plugin name strings (foldernames) in an array
101 101
      * @return array
102 102
      */
103
-    public function getPluginsTemplates($names=null) {
103
+    public function getPluginsTemplates($names = null) {
104 104
         if ($names) {
105 105
             $names = array_merge($this->requestedPlugins, $names);
106 106
             return $this->filterPluginsByName('templates', $names);
@@ -113,15 +113,15 @@  discard block
 block discarded – undo
113 113
      * @param array $names the plugin name strings (foldernames) in an array
114 114
      * @return array
115 115
      */
116
-    public function getTemplates($names=null) {
116
+    public function getTemplates($names = null) {
117 117
         $templateStrings = array();
118 118
         $plugins = $this->getPluginsTemplates($names);
119 119
         foreach ($plugins as $folder => $templates) {
120 120
             foreach ($templates as $path) {
121 121
                 if (file_exists($path)) {
122 122
                     $filename = explode('/', $path);
123
-                    $filename = $filename[sizeof($filename)-1];
124
-                    $id = $folder . '-' . substr($filename, 0 , (strrpos($filename, ".")));
123
+                    $filename = $filename[sizeof($filename) - 1];
124
+                    $id = $folder.'-'.substr($filename, 0, (strrpos($filename, ".")));
125 125
                     $templateStrings[$id] = file_get_contents($path);
126 126
                 }
127 127
             }
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,8 +40,7 @@
 block discarded – undo
40 40
                     $ret[$name] = array();
41 41
                     if ($raw) {
42 42
                         $ret[$name] = $files[$type];
43
-                    }
44
-                    else {
43
+                    } else {
45 44
                         foreach ($files[$type] as $file) {
46 45
                             array_push($ret[$name], 'plugins/' . $name . '/' . $file);
47 46
                         }
Please login to merge, or discard this patch.
model/Concept.php 4 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -312,8 +312,7 @@  discard block
 block discarded – undo
312 312
             foreach ($res->propertyUris() as $prop) {
313 313
                 $this->addPropertyValues($res, $prop, $seen);
314 314
             }
315
-        }
316
-        else {
315
+        } else {
317 316
             foreach ($props as $prop) {
318 317
                 if ($res->hasProperty($prop)) {
319 318
                     $this->addPropertyValues($res, $prop, $seen);
@@ -850,8 +849,7 @@  discard block
 block discarded – undo
850 849
         if (!in_array($vocabUriSpace, $context, true)) {
851 850
             if (!isset($context[$vocabPrefix])) {
852 851
                 $context[$vocabPrefix] = $vocabUriSpace;
853
-            }
854
-            else if ($context[$vocabPrefix] !== $vocabUriSpace) {
852
+            } else if ($context[$vocabPrefix] !== $vocabUriSpace) {
855 853
                 $i = 2;
856 854
                 while (isset($context[$vocabPrefix . $i]) && $context[$vocabPrefix . $i] !== $vocabUriSpace) {
857 855
                     $i += 1;
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -517,13 +517,13 @@
 block discarded – undo
517 517
                     
518 518
                     $defaultPropLabel = $this->model->getDefaultSparql()->queryLabel($longUri, '');
519 519
 
520
-					if($envLangLabels) {
521
-						$proplabel = $envLangLabels[$this->getEnvLang()];
520
+          if($envLangLabels) {
521
+            $proplabel = $envLangLabels[$this->getEnvLang()];
522 522
                     } else {
523
-						if($defaultPropLabel) {
524
-							$proplabel = $defaultPropLabel[''];
525
-						}
526
-					}
523
+            if($defaultPropLabel) {
524
+              $proplabel = $defaultPropLabel[''];
525
+            }
526
+          }
527 527
                 }
528 528
 
529 529
                 // look for superproperties in the current graph
Please login to merge, or discard this patch.
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -74,6 +74,7 @@  discard block
 block discarded – undo
74 74
      * @param Vocabulary $vocab
75 75
      * @param EasyRdf\Resource $resource
76 76
      * @param EasyRdf\Graph $graph
77
+     * @param string|null $clang
77 78
      */
78 79
     public function __construct($model, $vocab, $resource, $graph, $clang)
79 80
     {
@@ -738,6 +739,7 @@  discard block
 block discarded – undo
738 739
 
739 740
     /**
740 741
      * Gets the groups/arrays the concept belongs to.
742
+     * @param boolean $includeArrays
741 743
      */
742 744
     private function getCollections($includeArrays) {
743 745
         $groups = array();
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 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,15 +512,15 @@  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 517
                     
518 518
                     $defaultPropLabel = $this->model->getDefaultSparql()->queryLabel($longUri, '');
519 519
 
520
-					if($envLangLabels) {
520
+					if ($envLangLabels) {
521 521
 						$proplabel = $envLangLabels[$this->getEnvLang()];
522 522
                     } else {
523
-						if($defaultPropLabel) {
523
+						if ($defaultPropLabel) {
524 524
 							$proplabel = $defaultPropLabel[''];
525 525
 						}
526 526
 					}
@@ -533,12 +533,12 @@  discard block
 block discarded – undo
533 533
                 }
534 534
 
535 535
                 // also look up superprops in the default graph if not found in current vocabulary
536
-                if(!$superprops || empty($superprops)) {
536
+                if (!$superprops || empty($superprops)) {
537 537
                     $superprops = $this->model->getDefaultSparql()->querySuperProperties($longUri);
538 538
                 }
539 539
 
540 540
                 // we're reading only one super property, even if there are multiple ones
541
-                $superprop = ($superprops)?$superprops[0]:null;
541
+                $superprop = ($superprops) ? $superprops[0] : null;
542 542
                 if ($superprop) {
543 543
                     $superprop = EasyRdf\RdfNamespace::shorten($superprop) ? EasyRdf\RdfNamespace::shorten($superprop) : $superprop;
544 544
                 }
@@ -551,7 +551,7 @@  discard block
 block discarded – undo
551 551
                 }
552 552
 
553 553
                 // searching for subproperties of literals too
554
-                if($superprops) {
554
+                if ($superprops) {
555 555
                     foreach ($superprops as $subi) {
556 556
                         $suburi = EasyRdf\RdfNamespace::shorten($subi) ? EasyRdf\RdfNamespace::shorten($subi) : $subi;
557 557
                         $duplicates[$suburi] = $prop;
@@ -671,14 +671,14 @@  discard block
 block discarded – undo
671 671
 
672 672
             // making a human readable string from the timestamps
673 673
             if ($created != '') {
674
-                $ret = gettext('skosmos:created') . ' ' . (Punic\Calendar::formatDate($created, 'short'));
674
+                $ret = gettext('skosmos:created').' '.(Punic\Calendar::formatDate($created, 'short'));
675 675
             }
676 676
 
677 677
             if ($modified != '') {
678 678
                 if ($created != '') {
679
-                    $ret .= ', ' . gettext('skosmos:modified') . ' ' . (Punic\Calendar::formatDate($modified, 'short'));
679
+                    $ret .= ', '.gettext('skosmos:modified').' '.(Punic\Calendar::formatDate($modified, 'short'));
680 680
                 } else {
681
-                    $ret .= ' ' . ucfirst(gettext('skosmos:modified')) . ' ' . (Punic\Calendar::formatDate($modified, 'short'));
681
+                    $ret .= ' '.ucfirst(gettext('skosmos:modified')).' '.(Punic\Calendar::formatDate($modified, 'short'));
682 682
                 }
683 683
 
684 684
             }
@@ -686,12 +686,12 @@  discard block
 block discarded – undo
686 686
             trigger_error($e->getMessage(), E_USER_WARNING);
687 687
             $ret = '';
688 688
             if ($this->resource->get('dc:modified')) {
689
-                $modified = (string) $this->resource->get('dc:modified');
690
-                $ret = gettext('skosmos:modified') . ' ' . $modified;
689
+                $modified = (string)$this->resource->get('dc:modified');
690
+                $ret = gettext('skosmos:modified').' '.$modified;
691 691
             }
692 692
             if ($this->resource->get('dc:created')) {
693
-                $created .= (string) $this->resource->get('dc:created');
694
-                $ret .= ' ' . gettext('skosmos:created') . ' ' . $created;
693
+                $created .= (string)$this->resource->get('dc:created');
694
+                $ret .= ' '.gettext('skosmos:created').' '.$created;
695 695
             }
696 696
         }
697 697
         return $ret;
@@ -763,7 +763,7 @@  discard block
 block discarded – undo
763 763
                     $groups[$collLabel] = array($group);
764 764
 
765 765
                     $res = $collection;
766
-                    while($super = $this->graph->resourcesMatching('skos:member', $res)) {
766
+                    while ($super = $this->graph->resourcesMatching('skos:member', $res)) {
767 767
                         foreach ($super as $res) {
768 768
                             $superprop = new ConceptPropertyValue($this->model, $this->vocab, $res, 'skosmos:memberOfSuper', $this->clang);
769 769
                             array_unshift($groups[$collLabel], $superprop);
@@ -805,7 +805,7 @@  discard block
 block discarded – undo
805 805
         $ret = array();
806 806
         foreach ($labels as $lit) {
807 807
             // filtering away subsets of the current language eg. en vs en-GB
808
-            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang() . '-') !== 0) {
808
+            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang().'-') !== 0) {
809 809
                 $prop = in_array($lit, $prefLabels) ? 'skos:prefLabel' : 'skos:altLabel';
810 810
                 $ret[$this->literalLanguageToString($lit)][] = new ConceptPropertyValueLiteral($this->model, $this->vocab, $this->resource, $lit, $prop);
811 811
             }
@@ -867,10 +867,10 @@  discard block
 block discarded – undo
867 867
             }
868 868
             else if ($context[$vocabPrefix] !== $vocabUriSpace) {
869 869
                 $i = 2;
870
-                while (isset($context[$vocabPrefix . $i]) && $context[$vocabPrefix . $i] !== $vocabUriSpace) {
870
+                while (isset($context[$vocabPrefix.$i]) && $context[$vocabPrefix.$i] !== $vocabUriSpace) {
871 871
                     $i += 1;
872 872
                 }
873
-                $context[$vocabPrefix . $i] = $vocabUriSpace;
873
+                $context[$vocabPrefix.$i] = $vocabUriSpace;
874 874
             }
875 875
         }
876 876
         $compactJsonLD = \ML\JsonLD\JsonLD::compact($this->graph->serialise('jsonld'), json_encode($context));
Please login to merge, or discard this patch.