Completed
Push — develop ( 612ef4...932e3c )
by Greg
11:36
created
app/Family.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 	/**
102 102
 	 * Get the male (or first female) partner of the family
103 103
 	 *
104
-	 * @param $access_level int|null
104
+	 * @param integer $access_level int|null
105 105
 	 *
106 106
 	 * @return Individual|null
107 107
 	 */
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 	/**
119 119
 	 * Get the female (or second male) partner of the family
120 120
 	 *
121
-	 * @param $access_level int|null
121
+	 * @param integer $access_level int|null
122 122
 	 *
123 123
 	 * @return Individual|null
124 124
 	 */
Please login to merge, or discard this patch.
app/Individual.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -388,7 +388,7 @@
 block discarded – undo
388 388
 	 *    (b) Level 1 object with the Highlight option missing or set to other than "Y" or "N"
389 389
 	 *    (c) Level 2 or higher object with the Highlight option set to "Y"
390 390
 	 *
391
-	 * @return null|Media
391
+	 * @return GedcomRecord|null
392 392
 	 */
393 393
 	public function findHighlightedMedia() {
394 394
 		$objectA = null;
Please login to merge, or discard this patch.
app/Statement.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -142,7 +142,7 @@
 block discarded – undo
142 142
 	 *
143 143
 	 * @param int $fetch_style
144 144
 	 *
145
-	 * @return \stdClass|array|null
145
+	 * @return \stdClass
146 146
 	 */
147 147
 	public function fetchOneRow($fetch_style = PDO::FETCH_OBJ) {
148 148
 		if (!$this->executed) {
Please login to merge, or discard this patch.
app/Mail.php 2 patches
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@
 block discarded – undo
16 16
 namespace Fisharebest\Webtrees;
17 17
 
18 18
 use Exception;
19
-use Swift_Mailer;
20 19
 use Swift_MailTransport;
20
+use Swift_Mailer;
21 21
 use Swift_Message;
22 22
 use Swift_NullTransport;
23 23
 use Swift_SmtpTransport;
Please login to merge, or discard this patch.
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -45,15 +45,15 @@  discard block
 block discarded – undo
45 45
 	 */
46 46
 	public static function send(Tree $tree, $to_email, $to_name, $replyto_email, $replyto_name, $subject, $message) {
47 47
 		try {
48
-		    $mail = Swift_Message::newInstance()
49
-                ->setSubject($subject)
50
-                ->setFrom(Site::getPreference('SMTP_FROM_NAME'), $tree->getPreference('title'))
51
-                ->setTo($to_email, $to_name)
52
-                ->setReplyTo($replyto_email, $replyto_name)
53
-                ->setBody($message, 'text/html')
54
-                ->addPart(Filter::unescapeHtml($message), 'text/plain');
48
+				$mail = Swift_Message::newInstance()
49
+								->setSubject($subject)
50
+								->setFrom(Site::getPreference('SMTP_FROM_NAME'), $tree->getPreference('title'))
51
+								->setTo($to_email, $to_name)
52
+								->setReplyTo($replyto_email, $replyto_name)
53
+								->setBody($message, 'text/html')
54
+								->addPart(Filter::unescapeHtml($message), 'text/plain');
55 55
 		    
56
-            Swift_Mailer::newInstance(self::transport())->send($mail);
56
+						Swift_Mailer::newInstance(self::transport())->send($mail);
57 57
 		} catch (Exception $ex) {
58 58
 			Log::addErrorLog('Mail: ' . $ex->getMessage());
59 59
 
@@ -93,20 +93,20 @@  discard block
 block discarded – undo
93 93
 		case 'internal':
94 94
 			return Swift_MailTransport::newInstance();
95 95
 		case 'external':
96
-            $transport = Swift_SmtpTransport::newInstance()
97
-                ->setHost(Site::getPreference('SMTP_HOST'))
98
-                ->setPort(Site::getPreference('SMTP_PORT'))
99
-                ->setLocalDomain(Site::getPreference('SMTP_HELO'));
96
+						$transport = Swift_SmtpTransport::newInstance()
97
+								->setHost(Site::getPreference('SMTP_HOST'))
98
+								->setPort(Site::getPreference('SMTP_PORT'))
99
+								->setLocalDomain(Site::getPreference('SMTP_HELO'));
100 100
             
101
-            if (Site::getPreference('SMTP_AUTH')) {
102
-                $transport
103
-                    ->setUsername(Site::getPreference('SMTP_AUTH_USER'))
104
-                    ->setPassword(Site::getPreference('SMTP_AUTH_PASS'));
105
-            }
101
+						if (Site::getPreference('SMTP_AUTH')) {
102
+								$transport
103
+										->setUsername(Site::getPreference('SMTP_AUTH_USER'))
104
+										->setPassword(Site::getPreference('SMTP_AUTH_PASS'));
105
+						}
106 106
             
107
-            if (Site::getPreference('SMTP_SSL') !== 'none') {
108
-                $transport->setEncryption(Site::getPreference('SMTP_SSL'));
109
-            }
107
+						if (Site::getPreference('SMTP_SSL') !== 'none') {
108
+								$transport->setEncryption(Site::getPreference('SMTP_SSL'));
109
+						}
110 110
 			
111 111
 			return $transport;
112 112
 		default:
Please login to merge, or discard this patch.
app/Controller/RelationshipController.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 	 * @param string $xref2
160 160
 	 * @param int    $tree_id
161 161
 	 *
162
-	 * @return array
162
+	 * @return string[]
163 163
 	 */
164 164
 	private function allAncestors($xref1, $xref2, $tree_id) {
165 165
 		$ancestors = array($xref1, $xref2);
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 	 * @param string $xref2
199 199
 	 * @param int    $tree_id
200 200
 	 *
201
-	 * @return array
201
+	 * @return string[]
202 202
 	 */
203 203
 	private function excludeFamilies($xref1, $xref2, $tree_id) {
204 204
 		return Database::prepare(
Please login to merge, or discard this patch.
app/Functions/FunctionsPrintLists.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1717,7 +1717,7 @@
 block discarded – undo
1717 1717
 					if ($endjd === $startjd) {
1718 1718
 						$html .= I18N::translate('No events exist for tomorrow.');
1719 1719
 					} else {
1720
-						$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));
1720
+						$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));
1721 1721
 					}
1722 1722
 				} else {
1723 1723
 					if ($endjd === $startjd) {
Please login to merge, or discard this patch.
app/Functions/FunctionsEdit.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -181,6 +181,7 @@
 block discarded – undo
181 181
 	/**
182 182
 	 * A list of GEDCOM relationships (e.g. for an edit control).
183 183
 	 *
184
+	 * @param string $relationship
184 185
 	 * @return string[]
185 186
 	 */
186 187
 	public static function optionsRelationships($relationship) {
Please login to merge, or discard this patch.
descendancy.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,6 @@
 block discarded – undo
19 19
 use Fisharebest\Webtrees\Database;
20 20
 use Fisharebest\Webtrees\Filter;
21 21
 use Fisharebest\Webtrees\Functions\FunctionsDate;
22
-use Fisharebest\Webtrees\Functions\FunctionsPrint;
23 22
 use Fisharebest\Webtrees\I18N;
24 23
 use Fisharebest\Webtrees\Theme;
25 24
 
Please login to merge, or discard this patch.
fanchart.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,6 @@
 block discarded – undo
19 19
 use Fisharebest\Webtrees\Database;
20 20
 use Fisharebest\Webtrees\Filter;
21 21
 use Fisharebest\Webtrees\Functions\FunctionsDate;
22
-use Fisharebest\Webtrees\Functions\FunctionsPrint;
23 22
 use Fisharebest\Webtrees\I18N;
24 23
 use Fisharebest\Webtrees\Theme;
25 24
 
Please login to merge, or discard this patch.