Completed
Push — master ( 60724f...42b01e )
by Henri
02:30
created
model/sparql/GenericSparql.php 3 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.
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.
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
         $starttime = microtime(true);
72 72
         $result = $this->client->query($query);
73 73
         $elapsed = intval(round((microtime(true) - $starttime) * 1000));
74
-        if(method_exists($result, 'numRows')) {
74
+        if (method_exists($result, 'numRows')) {
75 75
             $numRows = $result->numRows();
76 76
             $logger->info("[qid $queryId] result: $numRows rows returned in $elapsed ms");
77 77
         } else { // graph result
@@ -87,20 +87,20 @@  discard block
 block discarded – undo
87 87
      * @param Vocabulary[]|null $vocabs
88 88
      * @return string
89 89
      */
90
-    protected function generateFromClause($vocabs=null) {
90
+    protected function generateFromClause($vocabs = null) {
91 91
         $graphs = array();
92 92
         $clause = '';
93 93
         if (!$vocabs) {
94 94
             return $this->graph !== '?graph' && $this->graph !== NULL ? "FROM <$this->graph>" : '';
95 95
         }
96
-        foreach($vocabs as $vocab) {
96
+        foreach ($vocabs as $vocab) {
97 97
             $graph = $vocab->getGraph();
98 98
             if (!in_array($graph, $graphs)) {
99 99
                 array_push($graphs, $graph);
100 100
             }
101 101
         }
102 102
         foreach ($graphs as $graph) {
103
-            if($graph !== NULL)
103
+            if ($graph !== NULL)
104 104
                 $clause .= "FROM NAMED <$graph> "; 
105 105
         }
106 106
         return $clause;
@@ -698,7 +698,7 @@  discard block
 block discarded – undo
698 698
         foreach ($graphs as $graph) {
699 699
           $values[] = "<$graph>";
700 700
         }
701
-        return "FILTER (?graph IN (" . implode(',', $values) . "))";
701
+        return "FILTER (?graph IN (".implode(',', $values)."))";
702 702
     }
703 703
 
704 704
     /**
@@ -708,16 +708,16 @@  discard block
 block discarded – undo
708 708
      * @return string sparql query clauses
709 709
      */
710 710
     protected function formatLimitAndOffset($limit, $offset) {
711
-        $limit = ($limit) ? 'LIMIT ' . $limit : '';
712
-        $offset = ($offset) ? 'OFFSET ' . $offset : '';
711
+        $limit = ($limit) ? 'LIMIT '.$limit : '';
712
+        $offset = ($offset) ? 'OFFSET '.$offset : '';
713 713
         // eliminating whitespace and line changes when the conditions aren't needed.
714 714
         $limitandoffset = '';
715 715
         if ($limit && $offset) {
716
-            $limitandoffset = "\n" . $limit . "\n" . $offset;
716
+            $limitandoffset = "\n".$limit."\n".$offset;
717 717
         } elseif ($limit) {
718
-            $limitandoffset = "\n" . $limit;
718
+            $limitandoffset = "\n".$limit;
719 719
         } elseif ($offset) {
720
-            $limitandoffset = "\n" . $offset;
720
+            $limitandoffset = "\n".$offset;
721 721
         }
722 722
 
723 723
         return $limitandoffset;
@@ -737,7 +737,7 @@  discard block
 block discarded – undo
737 737
             }
738 738
         }
739 739
 
740
-        return implode(' UNION ', $typePatterns);;
740
+        return implode(' UNION ', $typePatterns); ;
741 741
     }
742 742
 
743 743
     /**
@@ -869,14 +869,14 @@  discard block
 block discarded – undo
869 869
         // if search language and UI/display language differ, must also consider case where there is no prefLabel in
870 870
         // the display language; in that case, should use the label with the same language as the matched label
871 871
         $labelcondFallback = ($searchLang != $lang) ?
872
-          "OPTIONAL { # in case previous OPTIONAL block gives no labels\n" .
872
+          "OPTIONAL { # in case previous OPTIONAL block gives no labels\n".
873 873
           "?s skos:prefLabel ?label . FILTER (LANGMATCHES(LANG(?label), LANG(?match))) }" : "";
874 874
           
875 875
         //  Including the labels if there is no query term given.
876 876
         if ($rawterm === '') {
877 877
           $labelClause = "?s skos:prefLabel ?label .";
878
-          $labelClause = ($lang) ? $labelClause . " FILTER (LANGMATCHES(LANG(?label), '$lang'))" : $labelClause . "";
879
-          return $labelClause . " BIND(?label AS ?match)";
878
+          $labelClause = ($lang) ? $labelClause." FILTER (LANGMATCHES(LANG(?label), '$lang'))" : $labelClause."";
879
+          return $labelClause." BIND(?label AS ?match)";
880 880
         }
881 881
 
882 882
         /*
@@ -938,19 +938,19 @@  discard block
 block discarded – undo
938 938
 
939 939
         $schemecond = '';
940 940
         if (!empty($schemes)) {
941
-            foreach($schemes as $scheme) {
941
+            foreach ($schemes as $scheme) {
942 942
                 $schemecond .= "?s skos:inScheme <$scheme> . ";
943 943
             }
944 944
         }
945
-        $filterDeprecated="";
945
+        $filterDeprecated = "";
946 946
         //show or hide deprecated concepts
947
-        if(!$showDeprecated){
948
-            $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }";
947
+        if (!$showDeprecated) {
948
+            $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
949 949
         }
950 950
         // extra conditions for parent and group, if specified
951
-        $parentcond = ($params->getParentLimit()) ? "?s skos:broader+ <" . $params->getParentLimit() . "> ." : "";
952
-        $groupcond = ($params->getGroupLimit()) ? "<" . $params->getGroupLimit() . "> skos:member ?s ." : "";
953
-        $pgcond = $parentcond . $groupcond;
951
+        $parentcond = ($params->getParentLimit()) ? "?s skos:broader+ <".$params->getParentLimit()."> ." : "";
952
+        $groupcond = ($params->getGroupLimit()) ? "<".$params->getGroupLimit()."> skos:member ?s ." : "";
953
+        $pgcond = $parentcond.$groupcond;
954 954
 
955 955
         $orderextra = $this->isDefaultEndpoint() ? $this->graph : '';
956 956
 
@@ -1023,9 +1023,9 @@  discard block
 block discarded – undo
1023 1023
             $hit['type'][] = $this->shortenUri($typeuri);
1024 1024
         }
1025 1025
 
1026
-        if(!empty($fields)) {
1026
+        if (!empty($fields)) {
1027 1027
             foreach ($fields as $prop) {
1028
-                $propname = $prop . 's';
1028
+                $propname = $prop.'s';
1029 1029
                 if (isset($row->$propname)) {
1030 1030
                     foreach (explode("\n", $row->$propname->getValue()) as $line) {
1031 1031
                         $rdata = str_getcsv($line, ',', '"', '"');
@@ -1040,7 +1040,7 @@  discard block
 block discarded – undo
1040 1040
                             $propvals = $rdata[2];
1041 1041
                         }
1042 1042
 
1043
-                        $hit['skos:' . $prop][] = $propvals;
1043
+                        $hit['skos:'.$prop][] = $propvals;
1044 1044
                     }
1045 1045
                 }
1046 1046
             }
@@ -1116,7 +1116,7 @@  discard block
 block discarded – undo
1116 1116
      * @return array query result object
1117 1117
      */
1118 1118
     public function queryConcepts($vocabs, $fields = null, $unique = false, $params, $showDeprecated = false) {
1119
-        $query = $this->generateConceptSearchQuery($fields, $unique, $params,$showDeprecated);
1119
+        $query = $this->generateConceptSearchQuery($fields, $unique, $params, $showDeprecated);
1120 1120
         $results = $this->query($query);
1121 1121
         return $this->transformConceptSearchResults($results, $vocabs, $fields);
1122 1122
     }
@@ -1170,9 +1170,9 @@  discard block
 block discarded – undo
1170 1170
         $conditions = $this->formatFilterConditions($letter, $lang);
1171 1171
         $filtercondLabel = $conditions['filterpref'];
1172 1172
         $filtercondALabel = $conditions['filteralt'];
1173
-        $filterDeprecated="";
1174
-        if(!$showDeprecated){
1175
-            $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }";
1173
+        $filterDeprecated = "";
1174
+        if (!$showDeprecated) {
1175
+            $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
1176 1176
         }
1177 1177
         $query = <<<EOQ
1178 1178
 SELECT DISTINCT ?s ?label ?alabel $fcl
@@ -1248,8 +1248,8 @@  discard block
 block discarded – undo
1248 1248
      * @param array $classes
1249 1249
      * @param boolean $showDeprecated whether to include deprecated concepts in the result (default: false)
1250 1250
      */
1251
-    public function queryConceptsAlphabetical($letter, $lang, $limit = null, $offset = null, $classes = null,$showDeprecated = false) {
1252
-        $query = $this->generateAlphabeticalListQuery($letter, $lang, $limit, $offset, $classes,$showDeprecated);
1251
+    public function queryConceptsAlphabetical($letter, $lang, $limit = null, $offset = null, $classes = null, $showDeprecated = false) {
1252
+        $query = $this->generateAlphabeticalListQuery($letter, $lang, $limit, $offset, $classes, $showDeprecated);
1253 1253
         $results = $this->query($query);
1254 1254
         return $this->transformAlphabeticalListResults($results);
1255 1255
     }
@@ -1541,7 +1541,7 @@  discard block
 block discarded – undo
1541 1541
                 if (!isset($row->label) || $row->label->getLang() === $lang) {
1542 1542
                     $ret[$row->object->getUri()] = $val;
1543 1543
                 } elseif ($row->label->getLang() === $fallbacklang) {
1544
-                    $val['label'] .= ' (' . $row->label->getLang() . ')';
1544
+                    $val['label'] .= ' ('.$row->label->getLang().')';
1545 1545
                     $ret[$row->object->getUri()] = $val;
1546 1546
                 }
1547 1547
             }
@@ -1637,10 +1637,10 @@  discard block
 block discarded – undo
1637 1637
 
1638 1638
             $label = null;
1639 1639
             if (isset($row->label)) {
1640
-                if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang . "-") == 0) {
1640
+                if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang."-") == 0) {
1641 1641
                     $label = $row->label->getValue();
1642 1642
                 } else {
1643
-                    $label = $row->label->getValue() . " (" . $row->label->getLang() . ")";
1643
+                    $label = $row->label->getValue()." (".$row->label->getLang().")";
1644 1644
                 }
1645 1645
 
1646 1646
             }
@@ -1716,8 +1716,8 @@  discard block
 block discarded – undo
1716 1716
         foreach ($result as $row) {
1717 1717
             if (isset($row->top) && isset($row->label)) {
1718 1718
                 $label = $row->label->getValue();
1719
-                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang . "-") !== 0) {
1720
-                    $label .= ' (' . $row->label->getLang() . ')';
1719
+                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang."-") !== 0) {
1720
+                    $label .= ' ('.$row->label->getLang().')';
1721 1721
                 }
1722 1722
                 $top = array('uri' => $row->top->getUri(), 'topConceptOf' => $row->topuri->getUri(), 'label' => $label, 'hasChildren' => filter_var($row->children->getValue(), FILTER_VALIDATE_BOOLEAN));
1723 1723
                 if (isset($row->notation)) {
@@ -1818,8 +1818,8 @@  discard block
 block discarded – undo
1818 1818
                 $label = null;
1819 1819
                 if (isset($row->childlabel)) {
1820 1820
                     $label = $row->childlabel->getValue();
1821
-                    if ($row->childlabel->getLang() !== $lang && strpos($row->childlabel->getLang(), $lang . "-") !== 0) {
1822
-                        $label .= " (" . $row->childlabel->getLang() . ")";
1821
+                    if ($row->childlabel->getLang() !== $lang && strpos($row->childlabel->getLang(), $lang."-") !== 0) {
1822
+                        $label .= " (".$row->childlabel->getLang().")";
1823 1823
                     }
1824 1824
 
1825 1825
                 }
@@ -1840,8 +1840,8 @@  discard block
 block discarded – undo
1840 1840
             }
1841 1841
             if (isset($row->label)) {
1842 1842
                 $preflabel = $row->label->getValue();
1843
-                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang . "-") !== 0) {
1844
-                    $preflabel .= ' (' . $row->label->getLang() . ')';
1843
+                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang."-") !== 0) {
1844
+                    $preflabel .= ' ('.$row->label->getLang().')';
1845 1845
                 }
1846 1846
 
1847 1847
                 $ret[$uri]['prefLabel'] = $preflabel;
@@ -1962,9 +1962,9 @@  discard block
 block discarded – undo
1962 1962
      */
1963 1963
     private function generateConceptGroupContentsQuery($groupClass, $group, $lang, $showDeprecated = false) {
1964 1964
         $fcl = $this->generateFromClause();
1965
-        $filterDeprecated="";
1966
-        if(!$showDeprecated){
1967
-            $filterDeprecated="  FILTER NOT EXISTS { ?conc owl:deprecated true }";
1965
+        $filterDeprecated = "";
1966
+        if (!$showDeprecated) {
1967
+            $filterDeprecated = "  FILTER NOT EXISTS { ?conc owl:deprecated true }";
1968 1968
         }
1969 1969
         $query = <<<EOQ
1970 1970
 SELECT ?conc ?super ?label ?members ?type ?notation $fcl
@@ -2003,10 +2003,10 @@  discard block
 block discarded – undo
2003 2003
                     'type' => array($row->type->shorten()),
2004 2004
                 );
2005 2005
                 if (isset($row->label)) {
2006
-                    if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang . "-") == 0) {
2006
+                    if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang."-") == 0) {
2007 2007
                         $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue();
2008 2008
                     } else {
2009
-                        $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue() . " (" . $row->label->getLang() . ")";
2009
+                        $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue()." (".$row->label->getLang().")";
2010 2010
                     }
2011 2011
 
2012 2012
                 }
@@ -2034,8 +2034,8 @@  discard block
 block discarded – undo
2034 2034
      * @param boolean $showDeprecated whether to include deprecated concepts in search results
2035 2035
      * @return array Result array with concept URI as key and concept label as value
2036 2036
      */
2037
-    public function listConceptGroupContents($groupClass, $group, $lang,$showDeprecated = false) {
2038
-        $query = $this->generateConceptGroupContentsQuery($groupClass, $group, $lang,$showDeprecated);
2037
+    public function listConceptGroupContents($groupClass, $group, $lang, $showDeprecated = false) {
2038
+        $query = $this->generateConceptGroupContentsQuery($groupClass, $group, $lang, $showDeprecated);
2039 2039
         $result = $this->query($query);
2040 2040
         return $this->transformConceptGroupContentsResults($result, $lang);
2041 2041
     }
@@ -2048,7 +2048,7 @@  discard block
 block discarded – undo
2048 2048
      */
2049 2049
     private function generateChangeListQuery($lang, $offset, $prop) {
2050 2050
         $fcl = $this->generateFromClause();
2051
-        $offset = ($offset) ? 'OFFSET ' . $offset : '';
2051
+        $offset = ($offset) ? 'OFFSET '.$offset : '';
2052 2052
 
2053 2053
         $query = <<<EOQ
2054 2054
 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   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -121,9 +121,9 @@  discard block
 block discarded – undo
121 121
 
122 122
         // 3. label in a subtag of the current language
123 123
         // We need to check all the labels in case one of them matches a subtag of the current language
124
-        foreach($this->resource->allLiterals('skos:prefLabel') as $label) {
124
+        foreach ($this->resource->allLiterals('skos:prefLabel') as $label) {
125 125
             // the label lang code is a subtag of the UI lang eg. en-GB - create a new literal with the main language
126
-            if ($label !== null && strpos($label->getLang(), $lang . '-') === 0) {
126
+            if ($label !== null && strpos($label->getLang(), $lang.'-') === 0) {
127 127
                 return EasyRdf\Literal::create($label, $lang);
128 128
             }
129 129
         }
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
         // 4. label in any language, including literal with empty language tag
132 132
         $label = $this->resource->label();
133 133
         if ($label !== null) {
134
-            return $label->getLang() ? $label->getValue() . " (" . $label->getLang() . ")" : $label->getValue();
134
+            return $label->getLang() ? $label->getValue()." (".$label->getLang().")" : $label->getValue();
135 135
         }
136 136
 
137 137
         // empty
@@ -462,14 +462,14 @@  discard block
 block discarded – undo
462 462
 
463 463
             // making a human readable string from the timestamps
464 464
             if ($created != '') {
465
-                $ret = gettext('skosmos:created') . ' ' . (Punic\Calendar::formatDate($created, 'short'));
465
+                $ret = gettext('skosmos:created').' '.(Punic\Calendar::formatDate($created, 'short'));
466 466
             }
467 467
 
468 468
             if ($modified != '') {
469 469
                 if ($created != '') {
470
-                    $ret .= ', ' . gettext('skosmos:modified') . ' ' . (Punic\Calendar::formatDate($modified, 'short'));
470
+                    $ret .= ', '.gettext('skosmos:modified').' '.(Punic\Calendar::formatDate($modified, 'short'));
471 471
                 } else {
472
-                    $ret .= ' ' . ucfirst(gettext('skosmos:modified')) . ' ' . (Punic\Calendar::formatDate($modified, 'short'));
472
+                    $ret .= ' '.ucfirst(gettext('skosmos:modified')).' '.(Punic\Calendar::formatDate($modified, 'short'));
473 473
                 }
474 474
 
475 475
             }
@@ -477,12 +477,12 @@  discard block
 block discarded – undo
477 477
             trigger_error($e->getMessage(), E_USER_WARNING);
478 478
             $ret = '';
479 479
             if ($this->resource->get('dc:modified')) {
480
-                $modified = (string) $this->resource->get('dc:modified');
481
-                $ret = gettext('skosmos:modified') . ' ' . $modified; 
480
+                $modified = (string)$this->resource->get('dc:modified');
481
+                $ret = gettext('skosmos:modified').' '.$modified; 
482 482
             }
483 483
             if ($this->resource->get('dc:created')) {
484
-                $created .= (string) $this->resource->get('dc:created');
485
-                $ret .= ' ' . gettext('skosmos:created') . ' ' . $created; 
484
+                $created .= (string)$this->resource->get('dc:created');
485
+                $ret .= ' '.gettext('skosmos:created').' '.$created; 
486 486
             }
487 487
         }
488 488
         return $ret;
@@ -592,7 +592,7 @@  discard block
 block discarded – undo
592 592
         $ret = array();
593 593
         foreach ($labels as $lit) {
594 594
             // filtering away subsets of the current language eg. en vs en-GB
595
-            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang() . '-') !== 0) {
595
+            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang().'-') !== 0) {
596 596
                 $prop = in_array($lit, $prefLabels) ? 'skos:prefLabel' : 'skos:altLabel'; 
597 597
                 $ret[$this->literalLanguageToString($lit)][] = new ConceptPropertyValueLiteral($lit, $prop);
598 598
             }
Please login to merge, or discard this patch.
model/ConceptPropertyValue.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
     {
25 25
         $label = is_string($this->getLabel()) ? $this->getLabel() : $this->getLabel()->getValue();
26 26
         if ($this->vocab->getConfig()->sortByNotation()) {
27
-            $label = $this->getNotation() . $label;
27
+            $label = $this->getNotation().$label;
28 28
         }
29 29
 
30 30
         return $label;
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
     public function getReifiedPropertyValues() {
121 121
         $ret = array();
122 122
         $props = $this->resource->propertyUris();
123
-        foreach($props as $prop) {
123
+        foreach ($props as $prop) {
124 124
             $prop = (EasyRdf\RdfNamespace::shorten($prop) !== null) ? EasyRdf\RdfNamespace::shorten($prop) : $prop;
125 125
             foreach ($this->resource->allLiterals($prop) as $val) {
126 126
                 if ($prop !== 'rdf:value' && $this->resource->get($prop)) { // shown elsewhere
Please login to merge, or discard this patch.
model/Model.php 2 patches
Braces   +9 added lines, -4 removed lines patch added patch discarded remove patch
@@ -108,10 +108,12 @@  discard block
 block discarded – undo
108 108
     
109 109
     private function initializeNamespaces() {
110 110
         foreach ($this->namespaces as $prefix => $fullUri) {
111
-            if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) // if not already defined
111
+            if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) {
112
+              // if not already defined
112 113
             {
113 114
                 EasyRdf\RdfNamespace::set($prefix, $fullUri);
114 115
             }
116
+            }
115 117
         }
116 118
     }
117 119
     
@@ -423,10 +425,12 @@  discard block
 block discarded – undo
423 425
                 // register vocabulary ids as RDF namespace prefixes
424 426
                 $prefix = preg_replace('/\W+/', '', $voc->getId()); // strip non-word characters
425 427
                 try {
426
-                    if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) // if not already defined
428
+                    if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) {
429
+                      // if not already defined
427 430
                     {
428 431
                         EasyRdf\RdfNamespace::set($prefix, $voc->getUriSpace());
429 432
                     }
433
+                    }
430 434
 
431 435
                 } catch (Exception $e) {
432 436
                     // not valid as namespace identifier, ignore
@@ -538,8 +542,9 @@  discard block
 block discarded – undo
538 542
         }
539 543
         
540 544
         foreach ($vocabs as $vocab) {
541
-            if ($vocab->getConceptLabel($uri, null) !== null)
542
-                return $vocab;
545
+            if ($vocab->getConceptLabel($uri, null) !== null) {
546
+                            return $vocab;
547
+            }
543 548
         }
544 549
 
545 550
         // if the URI couldn't be found, fall back to the first vocabulary
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -64,15 +64,15 @@  discard block
 block discarded – undo
64 64
     private function initializeVocabularies()
65 65
     {
66 66
         if (!file_exists($this->getConfig()->getVocabularyConfigFile())) {
67
-            throw new Exception($this->getConfig()->getVocabularyConfigFile() . ' is missing, please provide one.');
67
+            throw new Exception($this->getConfig()->getVocabularyConfigFile().' is missing, please provide one.');
68 68
         }
69 69
 
70 70
         try {
71 71
             // use APC user cache to store parsed vocabularies.ttl configuration
72 72
             if ($this->cache->isAvailable()) {
73 73
                 // @codeCoverageIgnoreStart
74
-                $key = realpath($this->getConfig()->getVocabularyConfigFile()) . ", " . filemtime($this->getConfig()->getVocabularyConfigFile());
75
-                $nskey = "namespaces of " . $key;
74
+                $key = realpath($this->getConfig()->getVocabularyConfigFile()).", ".filemtime($this->getConfig()->getVocabularyConfigFile());
75
+                $nskey = "namespaces of ".$key;
76 76
                 $this->graph = $this->cache->fetch($key);
77 77
                 $this->namespaces = $this->cache->fetch($nskey);
78 78
                 if ($this->graph === false || $this->namespaces === false) { // was not found in cache
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
                 $this->parseVocabularies($this->getConfig()->getVocabularyConfigFile());
86 86
             }
87 87
         } catch (Exception $e) {
88
-            echo "Error: " . $e->getMessage();
88
+            echo "Error: ".$e->getMessage();
89 89
         }
90 90
     }
91 91
 
@@ -297,18 +297,18 @@  discard block
 block discarded – undo
297 297
         }
298 298
 
299 299
         $vocabs = $params->getVocabs();
300
-        $showDeprecated=false;
300
+        $showDeprecated = false;
301 301
         if (sizeof($vocabs) === 1) { // search within vocabulary
302 302
             $voc = $vocabs[0];
303 303
             $sparql = $voc->getSparql();
304
-            $showDeprecated=$voc->getConfig()->getShowDeprecated();
304
+            $showDeprecated = $voc->getConfig()->getShowDeprecated();
305 305
         } else { // multi-vocabulary or global search
306 306
             $voc = null;
307 307
             $sparql = $this->getDefaultSparql();
308 308
             // @TODO : in a global search showDeprecated will always be false and cannot be set globally
309 309
         }
310 310
 
311
-        $results = $sparql->queryConcepts($vocabs, $params->getAdditionalFields(), $params->getUnique(), $params,$showDeprecated);
311
+        $results = $sparql->queryConcepts($vocabs, $params->getAdditionalFields(), $params->getUnique(), $params, $showDeprecated);
312 312
         if ($params->getRest() && $results && $params->getSearchLimit() !== 0) {
313 313
           $results = array_slice($results, $params->getOffset(), $params->getSearchLimit());
314 314
         }
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
     public function getVocabularyCategories()
459 459
     {
460 460
         $cats = $this->graph->allOfType('skos:Concept');
461
-        if(empty($cats)) {
461
+        if (empty($cats)) {
462 462
             return array(new VocabularyCategory($this, null));
463 463
         }
464 464
 
@@ -631,7 +631,7 @@  discard block
 block discarded – undo
631 631
         // using apc cache for the resource if available
632 632
         if ($this->cache->isAvailable()) {
633 633
             // @codeCoverageIgnoreStart
634
-            $key = 'fetch: ' . $uri;
634
+            $key = 'fetch: '.$uri;
635 635
             $resource = $this->cache->fetch($key);
636 636
             if ($resource === null || $resource === false) { // was not found in cache, or previous request failed
637 637
                 $resource = $this->fetchResourceFromUri($uri);
@@ -652,7 +652,7 @@  discard block
 block discarded – undo
652 652
      */
653 653
     public function getSparqlImplementation($dialect, $endpoint, $graph)
654 654
     {
655
-        $classname = $dialect . "Sparql";
655
+        $classname = $dialect."Sparql";
656 656
 
657 657
         return new $classname($endpoint, $graph, $this);
658 658
     }
Please login to merge, or discard this patch.
model/sparql/JenaTextSparql.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
         // 1. Ensure characters with special meaning in Lucene are escaped
40 40
         $lucenemap = array();
41 41
         foreach (str_split(self::LUCENE_ESCAPE_CHARS) as $char) {
42
-            $lucenemap[$char] = '\\' . $char; // escape with a backslash
42
+            $lucenemap[$char] = '\\'.$char; // escape with a backslash
43 43
         }
44 44
         $term = strtr($term, $lucenemap);
45 45
 
@@ -98,12 +98,12 @@  discard block
 block discarded – undo
98 98
 
99 99
         # make text query clause
100 100
         $lcletter = mb_strtolower($letter, 'UTF-8'); // convert to lower case, UTF-8 safe
101
-        $textcondPref = $this->createTextQueryCondition($letter . '*', 'skos:prefLabel', $lang);
102
-        $textcondAlt = $this->createTextQueryCondition($letter . '*', 'skos:altLabel', $lang);
101
+        $textcondPref = $this->createTextQueryCondition($letter.'*', 'skos:prefLabel', $lang);
102
+        $textcondAlt = $this->createTextQueryCondition($letter.'*', 'skos:altLabel', $lang);
103 103
 
104
-        $filterDeprecated="";
105
-        if(!$showDeprecated){
106
-            $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }";
104
+        $filterDeprecated = "";
105
+        if (!$showDeprecated) {
106
+            $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
107 107
         }
108 108
         
109 109
         $query = <<<EOQ
Please login to merge, or discard this patch.