fisharebest / webtrees

app/Http/Controllers/AdminController.php

Spacing +12 added lines, -12 removed lines

@@ -745,7 +745,7 @@ 
 	 * @return Response
 	 */
 	public function changesLogData(Request $request): Response {
-		list($select, , $where, $args1) = $this->changesQuery($request);
+		list($select,, $where, $args1) = $this->changesQuery($request);
 		list($order_by, $limit, $args2) = $this->dataTablesPagination($request);
 
 		$rows = Database::prepare(
@@ -819,7 +819,7 @@ 
 	 * @return Response
 	 */
 	public function changesLogDownload(Request $request): Response {
-		list($select, , $where, $args) = $this->changesQuery($request);
+		list($select,, $where, $args) = $this->changesQuery($request);
 
 		$rows = Database::prepare($select . $where)->execute($args)->fetchAll();
 
@@ -970,7 +970,7 @@ 
 		$args  = [];
 
 		if ($search !== '') {
-			$where           .= " AND (multimedia_file_refn LIKE CONCAT('%', :search1, '%') OR multimedia_file_refn LIKE CONCAT('%', :search2, '%'))";
+			$where .= " AND (multimedia_file_refn LIKE CONCAT('%', :search1, '%') OR multimedia_file_refn LIKE CONCAT('%', :search2, '%'))";
 			$args['search1'] = $search;
 			$args['search2'] = $search;
 		}
@@ -1151,7 +1151,7 @@ 
 		$data = array_map(function (string $thumbnail) {
 			$original = $this->findOriginalFileFromThumbnail($thumbnail);
 
-			$original_url  = route('unused-media-thumbnail', [
+			$original_url = route('unused-media-thumbnail', [
 				'folder' => dirname($original),
 				'file'   => basename($original),
 				'w'      => 100,
@@ -1691,36 +1691,36 @@ 
 		$where = ' WHERE 1';
 		$args  = [];
 		if ($search !== '') {
-			$where            .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))";
+			$where .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))";
 			$args['search_1'] = $search;
 			$args['search_2'] = $search;
 		}
 		if ($from !== '') {
-			$where        .= " AND change_time >= :from";
+			$where .= " AND change_time >= :from";
 			$args['from'] = $from;
 		}
 		if ($to !== '') {
-			$where      .= ' AND change_time < TIMESTAMPADD(DAY, 1 , :to)'; // before end of the day
+			$where .= ' AND change_time < TIMESTAMPADD(DAY, 1 , :to)'; // before end of the day
 			$args['to'] = $to;
 		}
 		if ($type !== '') {
-			$where          .= ' AND status = :status';
+			$where .= ' AND status = :status';
 			$args['status'] = $type;
 		}
 		if ($oldged !== '') {
-			$where           .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')";
+			$where .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')";
 			$args['old_ged'] = $oldged;
 		}
 		if ($newged !== '') {
-			$where           .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')";
+			$where .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')";
 			$args['new_ged'] = $newged;
 		}
 		if ($xref !== '') {
-			$where        .= " AND xref = :xref";
+			$where .= " AND xref = :xref";
 			$args['xref'] = $xref;
 		}
 		if ($username !== '') {
-			$where        .= " AND user_name LIKE CONCAT('%', :user, '%')";
+			$where .= " AND user_name LIKE CONCAT('%', :user, '%')";
 			$args['user'] = $username;
 		}
 		if ($ged !== '') {

app/Http/Controllers/LifespansChartController.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 		if ($individual !== null) {
 			$xrefs[] = $addxref;
 			if ($addfam) {
-				$xrefs = array_merge($xrefs,  $this->closeFamily($individual));
+				$xrefs = array_merge($xrefs, $this->closeFamily($individual));
 			}
 		}
 

app/Http/Controllers/PedigreeChartController.php

Spacing +2 added lines, -2 removed lines

@@ -366,7 +366,7 @@ 
 			$html = sprintf('<div id="childarrow"><a href="#" class="menuselect %s"></a><div id="childbox-pedigree">', $this->arrows->menu);
 
 			foreach ($families as $family) {
-				$html   .= '<span class="name1">' . I18N::translate('Family') . '</span>';
+				$html .= '<span class="name1">' . I18N::translate('Family') . '</span>';
 				$spouse = $family->getSpouse($this->root);
 				if ($spouse) {
 					$html .= '<a class="name1" href="' . e(route('pedigree', [
@@ -426,7 +426,7 @@ 
 		$html = '';
 		if ($this->chartHasAncestors) {
 			if ($this->nodes[$index]['indi'] && $this->nodes[$index]['indi']->getChildFamilies()) {
-				$html         .= '<div class="ancestorarrow">';
+				$html .= '<div class="ancestorarrow">';
 				$rootParentId = 1;
 				if ($index > (int) ($this->treesize / 2) + (int) ($this->treesize / 4)) {
 					$rootParentId++;

app/Http/Controllers/AccountController.php

Spacing +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
 			->setPreference('TIMEZONE', $time_zone)
 			->setPreference('visibleonline', $visible_online);
 
-		$tree->setUserPreference($user,'rootid', $rootid);
+		$tree->setUserPreference($user, 'rootid', $rootid);
 
 		// Switch to the new theme now
 		Session::put('theme_id', $theme);

app/Http/Controllers/HourglassChartController.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
 		$maximum_generations = (int) $tree->getPreference('MAX_DESCENDANCY_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
 		$default_generations = (int) $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
 
-		$generations  = (int) $request->get('generations', $default_generations);
+		$generations = (int) $request->get('generations', $default_generations);
 
 		$generations = min($generations, $maximum_generations);
 		$generations = max($generations, self::MINIMUM_GENERATIONS);
@@ -220,7 +220,7 @@ 
 				echo '<table cellspacing="0" cellpadding="0" border="0" style="position: relative; top: auto; float: ' . $tablealign . ';">';
 				for ($i = 0; $i < $ct; $i++) {
 					$individual2 = $children[$i];
-					$chil    = $individual2->getXref();
+					$chil = $individual2->getXref();
 					echo '<tr>';
 					echo '<td id="td_', e($chil), '" class="', I18N::direction(), '" style="text-align:', $otablealign, '">';
 					$this->printDescendency($individual2, $generation + 1, $generations, $show_spouse, false);

app/Http/Controllers/HelpTextController.php

Spacing +6 added lines, -6 removed lines

@@ -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/ListController.php

Spacing +12 added lines, -12 removed lines

@@ -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/RelationshipsChartController.php

Spacing +4 added lines, -4 removed lines

@@ -105,7 +105,7 @@ 
 		$recursion = (int) $request->get('recursion', '0');
 		$ancestors = (bool) $request->get('ancestors', '0');
 
-		$max_recursion  = (int) $tree->getPreference('RELATIONSHIP_RECURSION', RelationshipsChartModule::DEFAULT_RECURSION);
+		$max_recursion = (int) $tree->getPreference('RELATIONSHIP_RECURSION', RelationshipsChartModule::DEFAULT_RECURSION);
 
 		$recursion = min($recursion, $max_recursion);
 
@@ -153,14 +153,14 @@ 
 							case 'sis':
 							case 'sib':
 								$table[$x + 1][$y] = '<div style="background:url(' . Theme::theme()->parameter('image-hline') . ') repeat-x center;  width: 94px; text-align: center"><div class="hline-text" style="height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px;">' . FontAwesome::decorativeIcon('arrow-end') . '</div></div>';
-								$x                 += 2;
+								$x += 2;
 								break;
 							case 'son':
 							case 'dau':
 							case 'chi':
 								if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) {
 									$table[$x + 1][$y - 1] = '<div style="background:url(' . $diagonal2 . '); width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: end;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: start;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>';
-									$x                     += 2;
+									$x += 2;
 								} else {
 									$table[$x][$y - 1] = '<div style="background:url(' . Theme::theme()
 											->parameter('image-vline') . ') repeat-y center; height: 64px; text-align: center;"><div class="vline-text" style="display: inline-block; width:50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>';
@@ -172,7 +172,7 @@ 
 							case 'par':
 								if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) {
 									$table[$x + 1][$y + 1] = '<div style="background:url(' . $diagonal1 . '); background-position: top right; width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: start;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: end;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>';
-									$x                     += 2;
+									$x += 2;
 								} else {
 									$table[$x][$y + 1] = '<div style="background:url(' . Theme::theme()
 											->parameter('image-vline') . ') repeat-y center; height: 64px; text-align:center; "><div class="vline-text" style="display: inline-block; width: 50%; line-height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . FontAwesome::decorativeIcon('arrow-up') . '</div></div>';

app/FactLocation.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;