fisharebest / webtrees

app/Family.php

Doc Comments +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
 	/**
 	 * Get the male (or first female) partner of the family
 	 *
-	 * @param $access_level int|null
+	 * @param integer $access_level int|null
 	 *
 	 * @return Individual|null
 	 */
@@ -118,7 +118,7 @@ 
 	/**
 	 * Get the female (or second male) partner of the family
 	 *
-	 * @param $access_level int|null
+	 * @param integer $access_level int|null
 	 *
 	 * @return Individual|null
 	 */

app/Individual.php

Doc Comments +1 added lines, -1 removed lines

@@ -388,7 +388,7 @@
 	 *    (b) Level 1 object with the Highlight option missing or set to other than "Y" or "N"
 	 *    (c) Level 2 or higher object with the Highlight option set to "Y"
 	 *
-	 * @return null|Media
+	 * @return GedcomRecord|null
 	 */
 	public function findHighlightedMedia() {
 		$objectA = null;

app/Statement.php

Doc Comments +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
 	 *
 	 * @param int $fetch_style
 	 *
-	 * @return \stdClass|array|null
+	 * @return \stdClass
 	 */
 	public function fetchOneRow($fetch_style = PDO::FETCH_OBJ) {
 		if (!$this->executed) {

app/Mail.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -16,8 +16,8 @@
 namespace Fisharebest\Webtrees;
 
 use Exception;
-use Swift_Mailer;
 use Swift_MailTransport;
+use Swift_Mailer;
 use Swift_Message;
 use Swift_NullTransport;
 use Swift_SmtpTransport;

Indentation +20 added lines, -20 removed lines

@@ -45,15 +45,15 @@ 
 	 */
 	public static function send(Tree $tree, $to_email, $to_name, $replyto_email, $replyto_name, $subject, $message) {
 		try {
-		    $mail = Swift_Message::newInstance()
-                ->setSubject($subject)
-                ->setFrom(Site::getPreference('SMTP_FROM_NAME'), $tree->getPreference('title'))
-                ->setTo($to_email, $to_name)
-                ->setReplyTo($replyto_email, $replyto_name)
-                ->setBody($message, 'text/html')
-                ->addPart(Filter::unescapeHtml($message), 'text/plain');
+				$mail = Swift_Message::newInstance()
+								->setSubject($subject)
+								->setFrom(Site::getPreference('SMTP_FROM_NAME'), $tree->getPreference('title'))
+								->setTo($to_email, $to_name)
+								->setReplyTo($replyto_email, $replyto_name)
+								->setBody($message, 'text/html')
+								->addPart(Filter::unescapeHtml($message), 'text/plain');
 		    
-            Swift_Mailer::newInstance(self::transport())->send($mail);
+						Swift_Mailer::newInstance(self::transport())->send($mail);
 		} catch (Exception $ex) {
 			Log::addErrorLog('Mail: ' . $ex->getMessage());
 
@@ -93,20 +93,20 @@ 
 		case 'internal':
 			return Swift_MailTransport::newInstance();
 		case 'external':
-            $transport = Swift_SmtpTransport::newInstance()
-                ->setHost(Site::getPreference('SMTP_HOST'))
-                ->setPort(Site::getPreference('SMTP_PORT'))
-                ->setLocalDomain(Site::getPreference('SMTP_HELO'));
+						$transport = Swift_SmtpTransport::newInstance()
+								->setHost(Site::getPreference('SMTP_HOST'))
+								->setPort(Site::getPreference('SMTP_PORT'))
+								->setLocalDomain(Site::getPreference('SMTP_HELO'));
             
-            if (Site::getPreference('SMTP_AUTH')) {
-                $transport
-                    ->setUsername(Site::getPreference('SMTP_AUTH_USER'))
-                    ->setPassword(Site::getPreference('SMTP_AUTH_PASS'));
-            }
+						if (Site::getPreference('SMTP_AUTH')) {
+								$transport
+										->setUsername(Site::getPreference('SMTP_AUTH_USER'))
+										->setPassword(Site::getPreference('SMTP_AUTH_PASS'));
+						}
             
-            if (Site::getPreference('SMTP_SSL') !== 'none') {
-                $transport->setEncryption(Site::getPreference('SMTP_SSL'));
-            }
+						if (Site::getPreference('SMTP_SSL') !== 'none') {
+								$transport->setEncryption(Site::getPreference('SMTP_SSL'));
+						}
 			
 			return $transport;
 		default:

app/Controller/RelationshipController.php

Doc Comments +2 added lines, -2 removed lines

@@ -159,7 +159,7 @@ 
 	 * @param string $xref2
 	 * @param int    $tree_id
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	private function allAncestors($xref1, $xref2, $tree_id) {
 		$ancestors = array($xref1, $xref2);
@@ -198,7 +198,7 @@ 
 	 * @param string $xref2
 	 * @param int    $tree_id
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	private function excludeFamilies($xref1, $xref2, $tree_id) {
 		return Database::prepare(

app/Functions/FunctionsEdit.php

Doc Comments +1 added lines

@@ -181,6 +181,7 @@
 	/**
 	 * A list of GEDCOM relationships (e.g. for an edit control).
 	 *
+	 * @param string $relationship
 	 * @return string[]
 	 */
 	public static function optionsRelationships($relationship) {

Spacing +1 added lines, -1 removed lines

@@ -654,7 +654,7 @@
 		} elseif ($fact === 'REPO') {
 			echo
 				'<div class="input-group">' .
-				'<span class="input-group-btn"><button class="btn btn-secondary" type="button" onclick="createNewRecord(' . $element_id . ')" title="' . I18N::translate('Create a repository') . '"><i class="fa fa-plus"></i></button></span>' .				self::formControlRepository(Individual::getInstance($value, $WT_TREE), ['id' => $element_id, 'name' => $element_name]) .
+				'<span class="input-group-btn"><button class="btn btn-secondary" type="button" onclick="createNewRecord(' . $element_id . ')" title="' . I18N::translate('Create a repository') . '"><i class="fa fa-plus"></i></button></span>' . self::formControlRepository(Individual::getInstance($value, $WT_TREE), ['id' => $element_id, 'name' => $element_name]) .
 				'</div>';
 		} elseif ($fact === 'RESN') {
 			echo Bootstrap4::select(FunctionsEdit::optionsRestrictions(true), $value, ['id' => $element_id, 'name' => $element_name]);

descendancy.php

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use Fisharebest\Webtrees\Database;
 use Fisharebest\Webtrees\Filter;
 use Fisharebest\Webtrees\Functions\FunctionsDate;
-use Fisharebest\Webtrees\Functions\FunctionsPrint;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Theme;
 

medialist.php

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 						</option>
 					</select>
 				</td>
-				<?php else: ?>
+				<?php else : ?>
 					<td class="descriptionbox wrap"></td>
 					<td class="optionbox wrap"></td>
 				<?php endif ?>

Braces +3 added lines, -1 removed lines

@@ -109,7 +109,8 @@ 
 						</option>
 					</select>
 				</td>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<td class="descriptionbox wrap"></td>
 					<td class="optionbox wrap"></td>
 				<?php endif ?>
@@ -133,6 +134,7 @@ 
 						<?php
 						foreach (['10', '20', '30', '40', '50', '75', '100', '125', '150', '200'] as $selectEntry) {
 							echo '<option value="', $selectEntry, '" ';
+}
 							if ($selectEntry == $max) {
 								echo 'selected';
 							}

admin_trees_config.php

Braces +3 added lines, -1 removed lines

@@ -519,7 +519,8 @@ 
 					<div class="bg-danger text-danger">
 						<?= $resn->xref ?> — <?= I18N::translate('this record does not exist') ?>
 					</div>
-					<?php else: ?>
+					<?php else {
+	: ?>
 					<div class="text-muted">
 						<?= I18N::translate('All records') ?>
 					</div>
@@ -638,6 +639,7 @@ 
 				<span class="input-group-addon">
 					<?php
 					$person = Individual::getInstance($WT_TREE->getPreference('PEDIGREE_ROOT_ID'), $WT_TREE);
+}
 					if ($person) {
 						echo $person->getFullName(), ' ', $person->getLifeSpan();
 					} else {

Spacing +1 added lines, -1 removed lines

@@ -1470,7 +1470,7 @@
 					'0' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'first'),
 					'1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'),
 				], $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX', ['name' => 'SHOW_PEDIGREE_PLACES_SUFFIX'])),
-				Bootstrap4::select(FunctionsEdit::numericOptions(range(1,9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
+				Bootstrap4::select(FunctionsEdit::numericOptions(range(1, 9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
 			) ?>
 			<p class="small text-muted">
 				<?= /* I18N: Help text for the “Abbreviate place names” configuration setting */ I18N::translate('Place names are frequently too long to fit on charts, lists, etc. They can be abbreviated by showing just the first few parts of the name, such as <i>village, county</i>, or the last few part of it, such as <i>region, country</i>.') ?>