fisharebest / webtrees

app/Module/FamilyNavigatorModule.php

Braces +10 added lines, -4 removed lines

@@ -139,8 +139,11 @@ 
 					<div class="font9">
 						<?php echo $spouse->getLifeSpan(); ?>
 					</div>
-					<?php else: ?>
-						<?php echo $spouse->getFullName(); ?>
+					<?php else {
+	: ?>
+						<?php echo $spouse->getFullName();
+}
+?>
 					<?php endif; ?>
 				</td>
 			</tr>
@@ -164,8 +167,11 @@ 
 					<div class="font9">
 						<?php echo $child->getLifeSpan(); ?>
 					</div>
-					<?php else: ?>
-						<?php echo $child->getFullName(); ?>
+					<?php else {
+	: ?>
+						<?php echo $child->getFullName();
+}
+?>
 					<?php endif; ?>
 				</td>
 			</tr>

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(

relationship.php

Braces +10 added lines, -4 removed lines

@@ -102,7 +102,8 @@ 
 				<td class="optionbox">
 					<?php if ($ancestors_only === '1'): ?>
 						<input type="hidden" name="ancestors" value="1">
-					<?php else: ?>
+					<?php else {
+	: ?>
 						<label>
 							<input type="radio" name="ancestors" value="0" <?php echo $ancestors == 0 ? 'checked' : '' ?>>
 							<?php echo I18N::translate('Find any relationship') ?>
@@ -114,12 +115,15 @@ 
 						</label>
 
 						<hr>
-					<?php endif; ?>
+					<?php endif;
+}
+?>
 
 					<?php if ($max_recursion == 0): ?>
 						<?php echo I18N::translate('Find the closest relationships') ?>
 						<input type="hidden" name="recursion" value="0">
-					<?php else: ?>
+					<?php else {
+	: ?>
 						<label>
 							<input type="radio" name="recursion" value="0" <?php echo $recursion == 0 ? 'checked' : '' ?>>
 							<?php echo I18N::translate('Find the closest relationships') ?>
@@ -131,7 +135,9 @@ 
 								<?php echo I18N::translate('Find all possible relationships') ?>
 							<?php else: ?>
 								<?php echo I18N::translate('Find other relationships') ?>
-							<?php endif; ?>
+							<?php endif;
+}
+?>
 						</label>
 					<?php endif; ?>
 				</td>

app/Functions/FunctionsPrintLists.php

Spacing +6 added lines, -6 removed lines

@@ -1820,24 +1820,24 @@
 			if ($endjd === WT_CLIENT_JD) {
 				// We're dealing with the Today’s Events block
 				if ($filter === 0) {
-					$html .=  I18N::translate('No events exist for today.');
+					$html .= I18N::translate('No events exist for today.');
 				} else {
-					$html .=  I18N::translate('No events for living individuals exist for today.');
+					$html .= I18N::translate('No events for living individuals exist for today.');
 				}
 			} else {
 				// We're dealing with the Upcoming Events block
 				if ($filter === 0) {
 					if ($endjd === $startjd) {
-						$html .=  I18N::translate('No events exist for tomorrow.');
+						$html .= I18N::translate('No events exist for tomorrow.');
 					} else {
-						$html .=  /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
+						$html .= /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
 					}
 				} else {
 					if ($endjd === $startjd) {
-						$html .=  I18N::translate('No events for living individuals exist for tomorrow.');
+						$html .= I18N::translate('No events for living individuals exist for tomorrow.');
 					} else {
 						// I18N: translation for %s==1 is unused; it is translated separately as “tomorrow”
-						$html .=  I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
+						$html .= I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
 					}
 				}
 			}