@@ -76,10 +76,12 @@ |
||
| 76 | 76 | */ |
| 77 | 77 | public function getUriSpace() |
| 78 | 78 | { |
| 79 | - if ($this->urispace === null) // initialize cache |
|
| 79 | + if ($this->urispace === null) { |
|
| 80 | + // initialize cache |
|
| 80 | 81 | { |
| 81 | 82 | $this->urispace = $this->resource->getLiteral('void:uriSpace')->getValue(); |
| 82 | 83 | } |
| 84 | + } |
|
| 83 | 85 | |
| 84 | 86 | return $this->urispace; |
| 85 | 87 | } |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | * Get the localname of a concept in the vocabulary. If the URI is not |
| 110 | 110 | * in the URI space of this vocabulary, return the full URI. |
| 111 | 111 | * |
| 112 | - * @param $uri string full URI of concept |
|
| 112 | + * @param string $uri string full URI of concept |
|
| 113 | 113 | * @return string local name of concept, or original full URI if the local name cannot be determined |
| 114 | 114 | */ |
| 115 | 115 | public function getLocalName($uri) |
@@ -281,6 +281,8 @@ discard block |
||
| 281 | 281 | |
| 282 | 282 | /** |
| 283 | 283 | * Counts the statistics of the vocabulary. |
| 284 | + * @param string $array |
|
| 285 | + * @param string $group |
|
| 284 | 286 | * @return array of the concept/group counts |
| 285 | 287 | */ |
| 286 | 288 | public function getStatistics($lang = '', $array=null, $group=null) |
@@ -320,6 +322,7 @@ discard block |
||
| 320 | 322 | /** |
| 321 | 323 | * Gets the child relations of a concept and whether these children have more children. |
| 322 | 324 | * @param string $uri |
| 325 | + * @param string $lang |
|
| 323 | 326 | */ |
| 324 | 327 | public function getConceptChildren($uri, $lang) |
| 325 | 328 | { |
@@ -428,6 +431,8 @@ discard block |
||
| 428 | 431 | /** |
| 429 | 432 | * Lists the concepts available in the concept group. |
| 430 | 433 | * @param $clname |
| 434 | + * @param string $glname |
|
| 435 | + * @param string $clang |
|
| 431 | 436 | * @return array |
| 432 | 437 | */ |
| 433 | 438 | public function listConceptGroupContents($glname, $clang) |
@@ -595,6 +600,7 @@ discard block |
||
| 595 | 600 | * Returns a list of recently changed or entirely new concepts. |
| 596 | 601 | * @param string $clang content language for the labels |
| 597 | 602 | * @param string $lang UI language for the dates |
| 603 | + * @param string $prop |
|
| 598 | 604 | * @return Array |
| 599 | 605 | */ |
| 600 | 606 | public function getChangeList($prop, $clang, $lang, $offset) |
@@ -608,6 +614,9 @@ discard block |
||
| 608 | 614 | return $bydate; |
| 609 | 615 | } |
| 610 | 616 | |
| 617 | + /** |
|
| 618 | + * @param string $lang |
|
| 619 | + */ |
|
| 611 | 620 | public function getTitle($lang=null) { |
| 612 | 621 | return $this->config->getTitle($lang); |
| 613 | 622 | } |
@@ -10,6 +10,9 @@ |
||
| 10 | 10 | */ |
| 11 | 11 | class VocabularyCategory extends DataObject |
| 12 | 12 | { |
| 13 | + /** |
|
| 14 | + * @param Model $model |
|
| 15 | + */ |
|
| 13 | 16 | public function __construct($model, $resource) |
| 14 | 17 | { |
| 15 | 18 | if (!($model instanceof Model)) { |
@@ -55,6 +55,7 @@ |
||
| 55 | 55 | |
| 56 | 56 | /** |
| 57 | 57 | * Steps back, restoring the previous character or statement read() to the input buffer. |
| 58 | + * @param string $chars |
|
| 58 | 59 | */ |
| 59 | 60 | protected function unread($chars) |
| 60 | 61 | { |
@@ -79,10 +79,12 @@ |
||
| 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; |
@@ -46,12 +46,16 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -289,6 +289,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
@@ -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); |
@@ -69,8 +69,9 @@ |
||
| 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; |
@@ -400,7 +400,9 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -97,6 +97,9 @@ discard block |
||
| 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 |
||
| 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 |
@@ -407,6 +414,10 @@ discard block |
||
| 407 | 414 | return $this->returnJson($ret); |
| 408 | 415 | } |
| 409 | 416 | |
| 417 | + /** |
|
| 418 | + * @param string $label |
|
| 419 | + * @param string $lang |
|
| 420 | + */ |
|
| 410 | 421 | private function findLookupHits($results, $label, $lang) |
| 411 | 422 | { |
| 412 | 423 | $hits = array(); |
@@ -468,6 +479,9 @@ discard block |
||
| 468 | 479 | return $hits; |
| 469 | 480 | } |
| 470 | 481 | |
| 482 | + /** |
|
| 483 | + * @param string $lang |
|
| 484 | + */ |
|
| 471 | 485 | private function transformLookupResults($lang, $hits) |
| 472 | 486 | { |
| 473 | 487 | if (sizeof($hits) == 0) { |
@@ -539,6 +553,9 @@ discard block |
||
| 539 | 553 | return $this->returnJson($ret); |
| 540 | 554 | } |
| 541 | 555 | |
| 556 | + /** |
|
| 557 | + * @param Request $request |
|
| 558 | + */ |
|
| 542 | 559 | private function redirectToVocabData($request) { |
| 543 | 560 | $urls = $request->getVocab()->getConfig()->getDataURLs(); |
| 544 | 561 | if (sizeof($urls) == 0) { |
@@ -564,6 +581,10 @@ discard block |
||
| 564 | 581 | } |
| 565 | 582 | } |
| 566 | 583 | |
| 584 | + /** |
|
| 585 | + * @param string $results |
|
| 586 | + * @param string $format |
|
| 587 | + */ |
|
| 567 | 588 | private function returnDataResults($results, $format) { |
| 568 | 589 | if ($format == 'application/ld+json' || $format == 'application/json') { |
| 569 | 590 | // further compact JSON-LD document using a context |
@@ -693,6 +714,12 @@ discard block |
||
| 693 | 714 | return $this->returnJson($ret); |
| 694 | 715 | } |
| 695 | 716 | |
| 717 | + /** |
|
| 718 | + * @param string $uri |
|
| 719 | + * @param string $lang |
|
| 720 | + * @param string $propname |
|
| 721 | + * @param string $propuri |
|
| 722 | + */ |
|
| 696 | 723 | private function transformPropertyResults($uri, $lang, $objects, $propname, $propuri) |
| 697 | 724 | { |
| 698 | 725 | $results = array(); |
@@ -708,6 +735,14 @@ discard block |
||
| 708 | 735 | return $ret; |
| 709 | 736 | } |
| 710 | 737 | |
| 738 | + /** |
|
| 739 | + * @param string $uri |
|
| 740 | + * @param string $lang |
|
| 741 | + * @param string $tpropname |
|
| 742 | + * @param string $tpropuri |
|
| 743 | + * @param string $dpropname |
|
| 744 | + * @param string $dpropuri |
|
| 745 | + */ |
|
| 711 | 746 | private function transformTransitivePropertyResults($uri, $lang, $objects, $tpropname, $tpropuri, $dpropname, $dpropuri) |
| 712 | 747 | { |
| 713 | 748 | $results = array(); |
@@ -40,8 +40,7 @@ |
||
| 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 | } |