@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | /** |
| 207 | - * @param $name |
|
| 207 | + * @param \stdClass $name |
|
| 208 | 208 | * @return \stdClass |
| 209 | 209 | */ |
| 210 | 210 | private function cloneNamePOSC($name) |
@@ -497,6 +497,12 @@ discard block |
||
| 497 | 497 | } |
| 498 | 498 | |
| 499 | 499 | |
| 500 | + /** |
|
| 501 | + * @param \stdClass $data |
|
| 502 | + * @param integer $rank |
|
| 503 | + * |
|
| 504 | + * @return string |
|
| 505 | + */ |
|
| 500 | 506 | private function nameOrder($data, $rank) |
| 501 | 507 | { |
| 502 | 508 | $nameAsSortOrder = (($this->nameAsSortOrder === "first" && $rank === 0) || $this->nameAsSortOrder === "all"); |
@@ -549,7 +555,7 @@ discard block |
||
| 549 | 555 | } |
| 550 | 556 | |
| 551 | 557 | /** |
| 552 | - * @param $data |
|
| 558 | + * @param \stdClass $data |
|
| 553 | 559 | * @return array |
| 554 | 560 | */ |
| 555 | 561 | private function renderNameParts($data) |
@@ -580,7 +586,7 @@ discard block |
||
| 580 | 586 | } |
| 581 | 587 | |
| 582 | 588 | /** |
| 583 | - * @return mixed |
|
| 589 | + * @return string |
|
| 584 | 590 | */ |
| 585 | 591 | public function getDelimiter() |
| 586 | 592 | { |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | foreach ($node->attributes() as $attribute) { |
| 92 | 92 | switch ($attribute->getName()) { |
| 93 | 93 | case 'form': |
| 94 | - $this->form = (string)$attribute; |
|
| 94 | + $this->form = (string) $attribute; |
|
| 95 | 95 | break; |
| 96 | 96 | } |
| 97 | 97 | |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | cs:names element (taking into account the effects of et-al abbreviation and editor/translator collapsing), |
| 152 | 152 | which allows for advanced sorting. */ |
| 153 | 153 | if ($this->form == 'count') { |
| 154 | - return (int)count($resultNames); |
|
| 154 | + return (int) count($resultNames); |
|
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | return $text; |
@@ -503,8 +503,8 @@ discard block |
||
| 503 | 503 | $demoteNonDroppingParticle = CiteProc::getContext()->getGlobalOptions()->getDemoteNonDroppingParticles(); |
| 504 | 504 | |
| 505 | 505 | if ($this->form === "long" && $nameAsSortOrder && |
| 506 | - ((string)$demoteNonDroppingParticle === DemoteNonDroppingParticle::NEVER || |
|
| 507 | - (string)$demoteNonDroppingParticle === DemoteNonDroppingParticle::SORT_ONLY) |
|
| 506 | + ((string) $demoteNonDroppingParticle === DemoteNonDroppingParticle::NEVER || |
|
| 507 | + (string) $demoteNonDroppingParticle === DemoteNonDroppingParticle::SORT_ONLY) |
|
| 508 | 508 | ) { |
| 509 | 509 | |
| 510 | 510 | // [La] [Fontaine], [Jean] [de], [III] |
@@ -517,7 +517,7 @@ discard block |
||
| 517 | 517 | $text .= !empty($data->suffix) ? $this->sortSeparator . $data->suffix : ""; |
| 518 | 518 | } else if ($this->form === "long" && $nameAsSortOrder && |
| 519 | 519 | (is_null($demoteNonDroppingParticle) || |
| 520 | - (string)$demoteNonDroppingParticle === DemoteNonDroppingParticle::DISPLAY_AND_SORT) |
|
| 520 | + (string) $demoteNonDroppingParticle === DemoteNonDroppingParticle::DISPLAY_AND_SORT) |
|
| 521 | 521 | ) { |
| 522 | 522 | // [Fontaine], [Jean] [de] [La], [III] |
| 523 | 523 | |
@@ -76,7 +76,7 @@ |
||
| 76 | 76 | { |
| 77 | 77 | if (isset($data->{$particle}) && isset($data->{$namePart})) { |
| 78 | 78 | $data->{$namePart} = $data->{$particle} . " " . $data->{$namePart}; //prepend $particle to $namePart |
| 79 | - unset($data->{$particle});//remove particle from $data |
|
| 79 | + unset($data->{$particle}); //remove particle from $data |
|
| 80 | 80 | } |
| 81 | 81 | } |
| 82 | 82 | } |
| 83 | 83 | \ No newline at end of file |