| @@ -3,6 +3,9 @@ | ||
| 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); | 
| @@ -124,8 +124,8 @@ | ||
| 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 | /** | 
| @@ -7,11 +7,11 @@ | ||
| 7 | 7 | abstract class BaseConfig extends DataObject | 
| 8 | 8 |  { | 
| 9 | 9 | |
| 10 | - /** | |
| 11 | - * Returns a boolean value based on a literal value from the config.ttl configuration. | |
| 12 | - * @param string $property the property to query | |
| 13 | - * @param boolean $default the default value if the value is not set in configuration | |
| 14 | - */ | |
| 10 | + /** | |
| 11 | + * Returns a boolean value based on a literal value from the config.ttl configuration. | |
| 12 | + * @param string $property the property to query | |
| 13 | + * @param boolean $default the default value if the value is not set in configuration | |
| 14 | + */ | |
| 15 | 15 | protected function getBoolean($property, $default = false) | 
| 16 | 16 |      { | 
| 17 | 17 | $val = $this->getResource()->getLiteral($property); | 
| @@ -517,13 +517,13 @@ | ||
| 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 | 
| @@ -74,6 +74,7 @@ discard block | ||
| 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 | ||
| 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(); | 
| @@ -30,14 +30,14 @@ | ||
| 30 | 30 | $url = $baseurl . "$vocid/"; | 
| 31 | 31 |          } else { | 
| 32 | 32 | |
| 33 | -   	        if ($localname !== $uri && $localname === urlencode($localname)) { | |
| 34 | - // the URI can be shortened | |
| 33 | +              if ($localname !== $uri && $localname === urlencode($localname)) { | |
| 34 | + // the URI can be shortened | |
| 35 | 35 | $url = $baseurl . "$vocid/page/$localname"; | 
| 36 | 36 |              } else { | 
| 37 | 37 | // must use full URI | 
| 38 | -   	            $query = http_build_query(array('uri'=>$uri)); | |
| 38 | +                  $query = http_build_query(array('uri'=>$uri)); | |
| 39 | 39 | $url = $baseurl . "$vocid/page/?" . $query; | 
| 40 | - } | |
| 40 | + } | |
| 41 | 41 | } | 
| 42 | 42 | $this->redirect303($url); | 
| 43 | 43 | } | 
| @@ -169,6 +169,8 @@ | ||
| 169 | 169 | |
| 170 | 170 | /** | 
| 171 | 171 | * Return the mapping as a JSKOS-compatible array. | 
| 172 | + * @param string $lang | |
| 173 | + * @param string $hrefLink | |
| 172 | 174 | * @return array | 
| 173 | 175 | */ | 
| 174 | 176 | public function asJskos($queryExVocabs = true, $lang = null, $hrefLink = null) | 
| @@ -266,6 +266,7 @@ discard block | ||
| 266 | 266 | |
| 267 | 267 | /** | 
| 268 | 268 | * Returns skosmos:marcSourcecode value set in config.ttl. | 
| 269 | + * @param string $lang | |
| 269 | 270 | * @return string marcsource name | 
| 270 | 271 | */ | 
| 271 | 272 | public function getMarcSourceCode($lang = null) | 
| @@ -275,7 +276,7 @@ discard block | ||
| 275 | 276 | |
| 276 | 277 | /** | 
| 277 | 278 | * Returns a boolean value set in the config.ttl config. | 
| 278 | - * @return array array of concept class URIs (can be empty) | |
| 279 | + * @return string[] array of concept class URIs (can be empty) | |
| 279 | 280 | */ | 
| 280 | 281 | public function getIndexClasses() | 
| 281 | 282 |      { | 
| @@ -284,7 +285,7 @@ discard block | ||
| 284 | 285 | |
| 285 | 286 | /** | 
| 286 | 287 | * Returns skosmos:externalProperty values set in the config.ttl config. | 
| 287 | - * @return array array of external property URIs (can be empty) | |
| 288 | + * @return string[] array of external property URIs (can be empty) | |
| 288 | 289 | */ | 
| 289 | 290 | public function getExtProperties() | 
| 290 | 291 |      { | 
| @@ -410,6 +411,7 @@ discard block | ||
| 410 | 411 | |
| 411 | 412 | /** | 
| 412 | 413 | * Returns the vocabulary dc:type value(s) with their labels and uris, if set in the vocabulary configuration. | 
| 414 | + * @param string $lang | |
| 413 | 415 | * @return array of objects or an empty array | 
| 414 | 416 | */ | 
| 415 | 417 | public function getTypes($lang = null) | 
| @@ -23,6 +23,7 @@ discard block | ||
| 23 | 23 | |
| 24 | 24 | /** | 
| 25 | 25 | * Initializes the Model object. | 
| 26 | + * @param Model $model | |
| 26 | 27 | */ | 
| 27 | 28 | public function __construct($model) | 
| 28 | 29 |      { | 
| @@ -290,7 +291,7 @@ discard block | ||
| 290 | 291 | * Sends HTTP headers. Simply calls PHP built-in header function. But being | 
| 291 | 292 | * a function here, it can easily be tested/mocked. | 
| 292 | 293 | * | 
| 293 | - * @param $header string header to be sent | |
| 294 | + * @param string $header string header to be sent | |
| 294 | 295 | */ | 
| 295 | 296 | protected function sendHeader($header) | 
| 296 | 297 |      { | 
| @@ -152,7 +152,7 @@ discard block | ||
| 152 | 152 | |
| 153 | 153 | /** | 
| 154 | 154 | * Returns the graph instance | 
| 155 | - * @return object EasyRDF graph instance. | |
| 155 | + * @return string|null EasyRDF graph instance. | |
| 156 | 156 | */ | 
| 157 | 157 |      public function getGraph() { | 
| 158 | 158 | return $this->graph; | 
| @@ -287,6 +287,7 @@ discard block | ||
| 287 | 287 | /** | 
| 288 | 288 | * Counts the number of concepts in a easyRDF graph with a specific language. | 
| 289 | 289 | * @param array $langs Languages to query for | 
| 290 | + * @param string[] $classes | |
| 290 | 291 | * @return Array containing count of concepts for each language and property. | 
| 291 | 292 | */ | 
| 292 | 293 |      public function countLangConcepts($langs, $classes = null) { | 
| @@ -471,7 +472,7 @@ discard block | ||
| 471 | 472 | * Returns information (as a graph) for one or more concept URIs | 
| 472 | 473 | * @param mixed $uris concept URI (string) or array of URIs | 
| 473 | 474 | * @param string|null $arrayClass the URI for thesaurus array class, or null if not used | 
| 474 | - * @param \Vocabulary[]|null $vocabs vocabularies to target | |
| 475 | + * @param Vocabulary[] $vocabs vocabularies to target | |
| 475 | 476 | * @return \EasyRdf\Graph | 
| 476 | 477 | */ | 
| 477 | 478 |      public function queryConceptInfoGraph($uris, $arrayClass = null, $vocabs = array()) { | 
| @@ -487,7 +488,7 @@ discard block | ||
| 487 | 488 | |
| 488 | 489 | /** | 
| 489 | 490 | * Returns information (as an array of Concept objects) for one or more concept URIs | 
| 490 | - * @param mixed $uris concept URI (string) or array of URIs | |
| 491 | + * @param string $uris concept URI (string) or array of URIs | |
| 491 | 492 | * @param string|null $arrayClass the URI for thesaurus array class, or null if not used | 
| 492 | 493 | * @param \Vocabulary[] $vocabs vocabularies to target | 
| 493 | 494 | * @param string|null $clang content language | 
| @@ -705,7 +706,7 @@ discard block | ||
| 705 | 706 | |
| 706 | 707 | /** | 
| 707 | 708 | * Generate a VALUES clause for limiting the targeted graphs. | 
| 708 | - * @param Vocabulary[]|null $vocabs array of Vocabulary objects to target | |
| 709 | + * @param Vocabulary[] $vocabs array of Vocabulary objects to target | |
| 709 | 710 | * @return string VALUES clause, or "" if not necessary to limit | 
| 710 | 711 | */ | 
| 711 | 712 |      protected function formatValuesGraph($vocabs) { | 
| @@ -887,6 +888,7 @@ discard block | ||
| 887 | 888 | * @param string $searchLang language code used for matching labels (null means any language) | 
| 888 | 889 |       * @param string[] $props properties to target e.g. array('skos:prefLabel','skos:altLabel') | 
| 889 | 890 | * @param boolean $unique restrict results to unique concepts (default: false) | 
| 891 | + * @param string $filterGraph | |
| 890 | 892 | * @return string sparql query | 
| 891 | 893 | */ | 
| 892 | 894 | protected function generateConceptSearchQueryInner($term, $lang, $searchLang, $props, $unique, $filterGraph) | 
| @@ -1161,6 +1163,7 @@ discard block | ||
| 1161 | 1163 | /** | 
| 1162 | 1164 | * Generates sparql query clauses used for creating the alphabetical index. | 
| 1163 | 1165 | * @param string $letter the letter (or special class) to search for | 
| 1166 | + * @param string $lang | |
| 1164 | 1167 | * @return array of sparql query clause strings | 
| 1165 | 1168 | */ | 
| 1166 | 1169 |      private function formatFilterConditions($letter, $lang) { | 
| @@ -1328,6 +1331,7 @@ discard block | ||
| 1328 | 1331 | /** | 
| 1329 | 1332 | * Query for the first characters (letter or otherwise) of the labels in the particular language. | 
| 1330 | 1333 | * @param string $lang language | 
| 1334 | + * @param string[] $classes | |
| 1331 | 1335 | * @return array array of characters | 
| 1332 | 1336 | */ | 
| 1333 | 1337 |      public function queryFirstCharacters($lang, $classes = null) { | 
| @@ -1650,7 +1654,7 @@ discard block | ||
| 1650 | 1654 | /** | 
| 1651 | 1655 | * Query a single transitive property of a concept. | 
| 1652 | 1656 | * @param string $uri | 
| 1653 | - * @param array $props the property/properties. | |
| 1657 | + * @param string[] $props the property/properties. | |
| 1654 | 1658 | * @param string $lang | 
| 1655 | 1659 | * @param string $fallbacklang language to use if label is not available in the preferred language | 
| 1656 | 1660 | * @param integer $limit | 
| @@ -65,7 +65,7 @@ discard block | ||
| 65 | 65 | * | 
| 66 | 66 | * @param string $query | 
| 67 | 67 | * @return string | 
| 68 | - */ | |
| 68 | + */ | |
| 69 | 69 | protected function generateQueryPrefixes($query) | 
| 70 | 70 |      { | 
| 71 | 71 | // Check for undefined prefixes | 
| @@ -233,9 +233,9 @@ discard block | ||
| 233 | 233 | $gcl = $this->graphClause; | 
| 234 | 234 |          $classes = ($classes) ? $classes : array('http://www.w3.org/2004/02/skos/core#Concept'); | 
| 235 | 235 | |
| 236 | -	$quote_string = function($val) { return "'$val'"; }; | |
| 237 | - $quoted_values = array_map($quote_string, $langs); | |
| 238 | -	$langFilter = "FILTER(?lang IN (" . implode(',', $quoted_values) . "))"; | |
| 236 | +  $quote_string = function($val) { return "'$val'"; }; | |
| 237 | + $quoted_values = array_map($quote_string, $langs); | |
| 238 | +  $langFilter = "FILTER(?lang IN (" . implode(',', $quoted_values) . "))"; | |
| 239 | 239 | |
| 240 | 240 |          $values = $this->formatValues('?type', $classes, 'uri'); | 
| 241 | 241 |          $valuesProp = $this->formatValues('?prop', $props, null); | 
| @@ -951,7 +951,7 @@ discard block | ||
| 951 | 951 | return $query; | 
| 952 | 952 | } | 
| 953 | 953 | /** | 
| 954 | - * This function can be overwritten in other SPARQL dialects for the possibility of handling the differenc language clauses | |
| 954 | + * This function can be overwritten in other SPARQL dialects for the possibility of handling the differenc language clauses | |
| 955 | 955 | * @param string $lang | 
| 956 | 956 | * @return string formatted language clause | 
| 957 | 957 | */ | 
| @@ -1845,7 +1845,7 @@ discard block | ||
| 1845 | 1845 | |
| 1846 | 1846 | /** | 
| 1847 | 1847 | * Generates a sparql query for finding the hierarchy for a concept. | 
| 1848 | - * A concept may be a top concept in multiple schemes, returned as a single whitespace-separated literal. | |
| 1848 | + * A concept may be a top concept in multiple schemes, returned as a single whitespace-separated literal. | |
| 1849 | 1849 | * @param string $uri concept uri. | 
| 1850 | 1850 | * @param string $lang | 
| 1851 | 1851 | * @param string $fallback language to use if label is not available in the preferred language | 
| @@ -1922,10 +1922,10 @@ discard block | ||
| 1922 | 1922 | $ret[$uri]['exact'] = $row->exact->getUri(); | 
| 1923 | 1923 | } | 
| 1924 | 1924 |              if (isset($row->tops)) { | 
| 1925 | -               $topConceptsList=explode(" ", $row->tops->getValue()); | |
| 1926 | - // sort to garantee an alphabetical ordering of the URI | |
| 1927 | - sort($topConceptsList); | |
| 1928 | - $ret[$uri]['tops'] = $topConceptsList; | |
| 1925 | +                $topConceptsList=explode(" ", $row->tops->getValue()); | |
| 1926 | + // sort to garantee an alphabetical ordering of the URI | |
| 1927 | + sort($topConceptsList); | |
| 1928 | + $ret[$uri]['tops'] = $topConceptsList; | |
| 1929 | 1929 | } | 
| 1930 | 1930 |              if (isset($row->children)) { | 
| 1931 | 1931 |                  if (!isset($ret[$uri]['narrower'])) { |