fisharebest / webtrees

app/Http/Controllers/ListController.php

Spacing +13 added lines, -13 removed lines

@@ -13,7 +13,7 @@ 
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Fisharebest\Webtrees\Http\Controllers;
 
@@ -287,7 +287,7 @@ 
 					}
 					// Don't sublists short lists.
 					if ($count < $tree->getPreference('SUBLIST_TRIGGER_I')) {
-						$falpha              = '';
+						$falpha = '';
 					} else {
 						$givn_initials = $this->givenAlpha($surname, $alpha, $show_marnm === 'yes', $families);
 						// Break long lists by initial letter of given name
@@ -508,7 +508,7 @@ 
 	 */
 	private function allMedia(Tree $tree, string $folder, string $subfolders, string $sort, string $filter, string $form_type): array {
 		// All files in the folder, plus external files
-		$sql  =
+		$sql =
 			"SELECT m_id AS xref, m_gedcom AS gedcom" .
 			" FROM `##media`" .
 			" JOIN `##media_file` USING (m_id, m_file)" .
@@ -527,11 +527,11 @@ 
 		// Include / exclude subfolders (but always include external)
 		switch ($subfolders) {
 			case 'include':
-				$sql    .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') $sql_external)";
+				$sql .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') $sql_external)";
 				$args[] = Database::escapeLike($folder);
 				break;
 			case 'exclude':
-				$sql    .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') AND multimedia_file_refn NOT LIKE CONCAT(?, '%/%') $sql_external)";
+				$sql .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') AND multimedia_file_refn NOT LIKE CONCAT(?, '%/%') $sql_external)";
 				$args[] = Database::escapeLike($folder);
 				$args[] = Database::escapeLike($folder);
 				break;
@@ -539,13 +539,13 @@ 
 
 		// Apply search terms
 		if ($filter) {
-			$sql    .= " AND (SUBSTRING_INDEX(multimedia_file_refn, '/', -1) LIKE CONCAT('%', ?, '%') OR descriptive_title LIKE CONCAT('%', ?, '%'))";
+			$sql .= " AND (SUBSTRING_INDEX(multimedia_file_refn, '/', -1) LIKE CONCAT('%', ?, '%') OR descriptive_title LIKE CONCAT('%', ?, '%'))";
 			$args[] = Database::escapeLike($filter);
 			$args[] = Database::escapeLike($filter);
 		}
 
 		if ($form_type) {
-			$sql    .= " AND source_media_type = ?";
+			$sql .= " AND source_media_type = ?";
 			$args[] = $form_type;
 		}
 
@@ -1457,7 +1457,7 @@ 
 		];
 
 		foreach ($this->getAlphabetForLocale(WT_LOCALE) as $n => $letter) {
-			$sql                   .= " AND n_surn COLLATE :collate_" . $n . " NOT LIKE :letter_" . $n;
+			$sql .= " AND n_surn COLLATE :collate_" . $n . " NOT LIKE :letter_" . $n;
 			$args['collate_' . $n] = I18N::collation();
 			$args['letter_' . $n]  = $letter . '%';
 		}
@@ -1542,7 +1542,7 @@ 
 		];
 
 		if ($surn) {
-			$sql               .= " AND n_surn COLLATE :collate_1 = :surn";
+			$sql .= " AND n_surn COLLATE :collate_1 = :surn";
 			$args['collate_1'] = I18N::collation();
 			$args['surn']      = $surn;
 		} elseif ($salpha === ',') {
@@ -1593,7 +1593,7 @@ 
 		];
 
 		if ($surn) {
-			$sql               .= " AND n_surn COLLATE :collate_1 = :surn";
+			$sql .= " AND n_surn COLLATE :collate_1 = :surn";
 			$args['collate_1'] = I18N::collation();
 			$args['surn']      = $surn;
 		} elseif ($salpha === ',') {
@@ -1606,7 +1606,7 @@ 
 			// All surnames
 			$sql .= " AND n_surn NOT IN ('', '@N.N.')";
 		}
-		$sql               .= " GROUP BY n_surn COLLATE :collate_2, n_file) AS n2 ON (n1.n_surn = n2.n_surn COLLATE :collate_3 AND n1.n_file = n2.n_file)";
+		$sql .= " GROUP BY n_surn COLLATE :collate_2, n_file) AS n2 ON (n1.n_surn = n2.n_surn COLLATE :collate_3 AND n1.n_file = n2.n_file)";
 		$args['collate_2'] = I18N::collation();
 		$args['collate_3'] = I18N::collation();
 
@@ -1646,7 +1646,7 @@ 
 		];
 
 		if ($surn) {
-			$sql               .= " AND n_surn COLLATE :collate_1 = :surn";
+			$sql .= " AND n_surn COLLATE :collate_1 = :surn";
 			$args['collate_1'] = I18N::collation();
 			$args['surn']      = $surn;
 		} elseif ($salpha === ',') {
@@ -1663,7 +1663,7 @@ 
 			$sql .= " AND " . $this->getInitialSql('n_givn', $galpha);
 		}
 
-		$sql               .= " ORDER BY CASE n_surn WHEN '@N.N.' THEN 1 ELSE 0 END, n_surn COLLATE :collate_2, CASE n_givn WHEN '@P.N.' THEN 1 ELSE 0 END, n_givn COLLATE :collate_3";
+		$sql .= " ORDER BY CASE n_surn WHEN '@N.N.' THEN 1 ELSE 0 END, n_surn COLLATE :collate_2, CASE n_givn WHEN '@P.N.' THEN 1 ELSE 0 END, n_givn COLLATE :collate_3";
 		$args['collate_2'] = I18N::collation();
 		$args['collate_3'] = I18N::collation();
 

app/Http/Controllers/HelpTextController.php

Spacing +7 added lines, -7 removed lines

@@ -13,7 +13,7 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 	 */
-	declare(strict_types=1);
+	declare(strict_types = 1);
 
 	namespace Fisharebest\Webtrees\Http\Controllers;
 
@@ -116,18 +116,18 @@ 
 		];
 
 		const DMY_SHORTCUTS = [
-			'11 DEC 1913' => ['11/12/1913', '11-12-1913', '11.12.1913',],
-			'01 FEB 2003' => ['01/02/03', '01-02-03', '01.02.03',],
+			'11 DEC 1913' => ['11/12/1913', '11-12-1913', '11.12.1913', ],
+			'01 FEB 2003' => ['01/02/03', '01-02-03', '01.02.03', ],
 		];
 
 		const MDY_SHORTCUTS = [
-			'11 DEC 1913' => ['12/11/1913', '12-11-1913', '12.11.1913',],
-			'01 FEB 2003' => ['02/01/03', '02-01-03', '02.01.03',],
+			'11 DEC 1913' => ['12/11/1913', '12-11-1913', '12.11.1913', ],
+			'01 FEB 2003' => ['02/01/03', '02-01-03', '02.01.03', ],
 		];
 
 		const YMD_SHORTCUTS = [
-			'11 DEC 1913' => ['11/12/1913', '11-12-1913', '11.12.1913',],
-			'01 FEB 2003' => ['03/02/01', '03-02-01', '03.02.01',],
+			'11 DEC 1913' => ['11/12/1913', '11-12-1913', '11.12.1913', ],
+			'01 FEB 2003' => ['03/02/01', '03-02-01', '03.02.01', ],
 		];
 
 		/**

app/Http/Controllers/IndividualController.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 	 */
-	declare(strict_types=1);
+	declare(strict_types = 1);
 
 	namespace Fisharebest\Webtrees\Http\Controllers;
 

app/Http/Controllers/PendingChangesController.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Fisharebest\Webtrees\Http\Controllers;
 

resources/views/pending-changes-page.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 									<?php endforeach ?>
 								</td>
 								<td>
-									<a href="<?= e(Html::url('message.php', ['to' => $record_change->user_name, 'subject' => I18N::translate('Pending changes') . ' - ' . strip_tags($record_change->record->getFullName()), 'body' => WT_BASE_URL . $record_change->record->url(), 'ged' => $record_change->gedcom_name,])) ?>" title="<?= I18N::translate('Send a message') ?>">
+									<a href="<?= e(Html::url('message.php', ['to' => $record_change->user_name, 'subject' => I18N::translate('Pending changes') . ' - ' . strip_tags($record_change->record->getFullName()), 'body' => WT_BASE_URL . $record_change->record->url(), 'ged' => $record_change->gedcom_name, ])) ?>" title="<?= I18N::translate('Send a message') ?>">
 										<?= e($record_change->real_name) ?> - <?= e($record_change->user_name) ?>
 									</a>
 								</td>

resources/views/calendar-page.php

Spacing +1 added lines, -1 removed lines

@@ -185,4 +185,4 @@
 </form>
 
 
-<div class="wt-ajax-load wt-page-content" data-ajax-url="<?= e(route('calendar-events', ['ged' => $tree->getName(), 'cal' => $cal, 'day' => $day, 'month' => $month, 'year' => $year, 'view' => $view, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx,])) ?>"></div>
+<div class="wt-ajax-load wt-page-content" data-ajax-url="<?= e(route('calendar-events', ['ged' => $tree->getName(), 'cal' => $cal, 'day' => $day, 'month' => $month, 'year' => $year, 'view' => $view, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, ])) ?>"></div>

app/Http/Controllers/MessageController.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Fisharebest\Webtrees\Http\Controllers;