@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | } |
206 | 206 | |
207 | 207 | /** |
208 | - * @param $name |
|
208 | + * @param \stdClass $name |
|
209 | 209 | * @return \stdClass |
210 | 210 | */ |
211 | 211 | private function cloneNamePOSC($name) |
@@ -498,6 +498,12 @@ discard block |
||
498 | 498 | } |
499 | 499 | |
500 | 500 | |
501 | + /** |
|
502 | + * @param \stdClass $data |
|
503 | + * @param integer $rank |
|
504 | + * |
|
505 | + * @return string |
|
506 | + */ |
|
501 | 507 | private function nameOrder($data, $rank) |
502 | 508 | { |
503 | 509 | $nameAsSortOrder = (($this->nameAsSortOrder === "first" && $rank === 0) || $this->nameAsSortOrder === "all"); |
@@ -587,7 +593,7 @@ discard block |
||
587 | 593 | } |
588 | 594 | |
589 | 595 | /** |
590 | - * @return mixed |
|
596 | + * @return string |
|
591 | 597 | */ |
592 | 598 | public function getDelimiter() |
593 | 599 | { |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | foreach ($node->attributes() as $attribute) { |
93 | 93 | switch ($attribute->getName()) { |
94 | 94 | case 'form': |
95 | - $this->form = (string)$attribute; |
|
95 | + $this->form = (string) $attribute; |
|
96 | 96 | break; |
97 | 97 | } |
98 | 98 | |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | cs:names element (taking into account the effects of et-al abbreviation and editor/translator collapsing), |
153 | 153 | which allows for advanced sorting. */ |
154 | 154 | if ($this->form == 'count') { |
155 | - return (int)count($resultNames); |
|
155 | + return (int) count($resultNames); |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | return $text; |
@@ -505,8 +505,8 @@ discard block |
||
505 | 505 | |
506 | 506 | if (StringHelper::isLatinString(NameHelper::normalizeName($data)) || StringHelper::isCyrillicString(NameHelper::normalizeName($data))) { |
507 | 507 | if ($this->form === "long" && $nameAsSortOrder && |
508 | - ((string)$demoteNonDroppingParticle === DemoteNonDroppingParticle::NEVER || |
|
509 | - (string)$demoteNonDroppingParticle === DemoteNonDroppingParticle::SORT_ONLY) |
|
508 | + ((string) $demoteNonDroppingParticle === DemoteNonDroppingParticle::NEVER || |
|
509 | + (string) $demoteNonDroppingParticle === DemoteNonDroppingParticle::SORT_ONLY) |
|
510 | 510 | ) { |
511 | 511 | |
512 | 512 | // [La] [Fontaine], [Jean] [de], [III] |
@@ -519,7 +519,7 @@ discard block |
||
519 | 519 | $text .= !empty($data->suffix) ? $this->sortSeparator . $data->suffix : ""; |
520 | 520 | } else if ($this->form === "long" && $nameAsSortOrder && |
521 | 521 | (is_null($demoteNonDroppingParticle) || |
522 | - (string)$demoteNonDroppingParticle === DemoteNonDroppingParticle::DISPLAY_AND_SORT) |
|
522 | + (string) $demoteNonDroppingParticle === DemoteNonDroppingParticle::DISPLAY_AND_SORT) |
|
523 | 523 | ) { |
524 | 524 | // [Fontaine], [Jean] [de] [La], [III] |
525 | 525 | |
@@ -549,7 +549,7 @@ discard block |
||
549 | 549 | $text = !empty($given) ? $given . " " . $family : $family; |
550 | 550 | } |
551 | 551 | } else { |
552 | - $text = $this->form === "long" ? $data->family.$data->given : $data->family; |
|
552 | + $text = $this->form === "long" ? $data->family . $data->given : $data->family; |
|
553 | 553 | } |
554 | 554 | |
555 | 555 | return $text; |
@@ -77,7 +77,7 @@ |
||
77 | 77 | { |
78 | 78 | if (isset($data->{$particle}) && isset($data->{$namePart})) { |
79 | 79 | $data->{$namePart} = $data->{$particle} . " " . $data->{$namePart}; //prepend $particle to $namePart |
80 | - unset($data->{$particle});//remove particle from $data |
|
80 | + unset($data->{$particle}); //remove particle from $data |
|
81 | 81 | } |
82 | 82 | } |
83 | 83 |