Completed
Pull Request — master (#1644)
by Rico
10:33
created
app/Http/Controllers/ErrorController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
  * You should have received a copy of the GNU General Public License
14 14
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 15
  */
16
-declare(strict_types=1);
16
+declare(strict_types = 1);
17 17
 
18 18
 namespace Fisharebest\Webtrees\Http\Controllers;
19 19
 
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 			return new RedirectResponse(Html::url('admin_trees_manage.php', []));
58 58
 		}
59 59
 
60
-		return $this->viewResponse('errors/no-tree-access', [ 'title' => '' ]);
60
+		return $this->viewResponse('errors/no-tree-access', ['title' => '']);
61 61
 	}
62 62
 
63 63
 	/**
Please login to merge, or discard this patch.
app/Http/Controllers/FanChartController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
  * You should have received a copy of the GNU General Public License
14 14
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 15
  */
16
-declare(strict_types=1);
16
+declare(strict_types = 1);
17 17
 
18 18
 namespace Fisharebest\Webtrees\Http\Controllers;
19 19
 
Please login to merge, or discard this patch.
app/Http/Controllers/AbstractBaseController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
  * You should have received a copy of the GNU General Public License
14 14
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 15
  */
16
-declare(strict_types=1);
16
+declare(strict_types = 1);
17 17
 
18 18
 namespace Fisharebest\Webtrees\Http\Controllers;
19 19
 
Please login to merge, or discard this patch.
app/Http/Controllers/HourglassChartController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
  * You should have received a copy of the GNU General Public License
14 14
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 15
  */
16
-declare(strict_types=1);
16
+declare(strict_types = 1);
17 17
 
18 18
 namespace Fisharebest\Webtrees\Http\Controllers;
19 19
 
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 		$maximum_generations = (int) $tree->getPreference('MAX_DESCENDANCY_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
59 59
 		$default_generations = (int) $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
60 60
 
61
-		$generations  = (int) $request->get('generations', $default_generations);
61
+		$generations = (int) $request->get('generations', $default_generations);
62 62
 
63 63
 		$generations = min($generations, $maximum_generations);
64 64
 		$generations = max($generations, self::MINIMUM_GENERATIONS);
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 				echo '<table cellspacing="0" cellpadding="0" border="0" style="position: relative; top: auto; float: ' . $tablealign . ';">';
221 221
 				for ($i = 0; $i < $ct; $i++) {
222 222
 					$individual2 = $children[$i];
223
-					$chil    = $individual2->getXref();
223
+					$chil = $individual2->getXref();
224 224
 					echo '<tr>';
225 225
 					echo '<td id="td_', $chil, '" class="', I18N::direction(), '" style="text-align:', $otablealign, '">';
226 226
 					$this->printDescendency($individual2, $generation + 1, $generations, $show_spouse, false);
Please login to merge, or discard this patch.
app/Http/Controllers/RelationshipsChartController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
  * You should have received a copy of the GNU General Public License
14 14
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 15
  */
16
-declare(strict_types=1);
16
+declare(strict_types = 1);
17 17
 
18 18
 namespace Fisharebest\Webtrees\Http\Controllers;
19 19
 
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 		$recursion = (int) $request->get('recursion', '0');
106 106
 		$ancestors = (bool) $request->get('ancestors', '0');
107 107
 
108
-		$max_recursion  = (int) $tree->getPreference('RELATIONSHIP_RECURSION', RelationshipsChartModule::DEFAULT_RECURSION);
108
+		$max_recursion = (int) $tree->getPreference('RELATIONSHIP_RECURSION', RelationshipsChartModule::DEFAULT_RECURSION);
109 109
 
110 110
 		$recursion = min($recursion, $max_recursion);
111 111
 
@@ -153,14 +153,14 @@  discard block
 block discarded – undo
153 153
 							case 'sis':
154 154
 							case 'sib':
155 155
 								$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>';
156
-								$x                 += 2;
156
+								$x += 2;
157 157
 								break;
158 158
 							case 'son':
159 159
 							case 'dau':
160 160
 							case 'chi':
161 161
 								if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) {
162 162
 									$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>';
163
-									$x                     += 2;
163
+									$x += 2;
164 164
 								} else {
165 165
 									$table[$x][$y - 1] = '<div style="background:url(' . Theme::theme()
166 166
 											->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 @@  discard block
 block discarded – undo
172 172
 							case 'par':
173 173
 								if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) {
174 174
 									$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>';
175
-									$x                     += 2;
175
+									$x += 2;
176 176
 								} else {
177 177
 									$table[$x][$y + 1] = '<div style="background:url(' . Theme::theme()
178 178
 											->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>';
Please login to merge, or discard this patch.
app/Http/Controllers/TimelineChartController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
  * You should have received a copy of the GNU General Public License
14 14
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 15
  */
16
-declare(strict_types=1);
16
+declare(strict_types = 1);
17 17
 
18 18
 namespace Fisharebest\Webtrees\Http\Controllers;
19 19
 
Please login to merge, or discard this patch.
app/Http/Controllers/StatisticsChartController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
  * You should have received a copy of the GNU General Public License
14 14
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 15
  */
16
-declare(strict_types=1);
16
+declare(strict_types = 1);
17 17
 
18 18
 namespace Fisharebest\Webtrees\Http\Controllers;
19 19
 
@@ -1147,7 +1147,7 @@  discard block
 block discarded – undo
1147 1147
 				}
1148 1148
 			}
1149 1149
 		}
1150
-		$colors      = [
1150
+		$colors = [
1151 1151
 			'0000FF',
1152 1152
 			'FFA0CB',
1153 1153
 			'9F00FF',
Please login to merge, or discard this patch.
app/Http/Controllers/LifespansChartController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
  * You should have received a copy of the GNU General Public License
14 14
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 15
  */
16
-declare(strict_types=1);
16
+declare(strict_types = 1);
17 17
 
18 18
 namespace Fisharebest\Webtrees\Http\Controllers;
19 19
 
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 		if ($individual !== null) {
69 69
 			$xrefs[] = $addxref;
70 70
 			if ($addfam) {
71
-				$xrefs = array_merge($xrefs,  $this->closeFamily($individual));
71
+				$xrefs = array_merge($xrefs, $this->closeFamily($individual));
72 72
 			}
73 73
 		}
74 74
 
Please login to merge, or discard this patch.
app/Http/Controllers/PedigreeChartController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
  * You should have received a copy of the GNU General Public License
14 14
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 15
  */
16
-declare(strict_types=1);
16
+declare(strict_types = 1);
17 17
 
18 18
 namespace Fisharebest\Webtrees\Http\Controllers;
19 19
 
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 			$html = sprintf('<div id="childarrow"><a href="#" class="menuselect %s"></a><div id="childbox-pedigree">', $this->arrows->menu);
361 361
 
362 362
 			foreach ($families as $family) {
363
-				$html   .= '<span class="name1">' . I18N::translate('Family') . '</span>';
363
+				$html .= '<span class="name1">' . I18N::translate('Family') . '</span>';
364 364
 				$spouse = $family->getSpouse($this->root);
365 365
 				if ($spouse) {
366 366
 					$html .= '<a class="name1" href="' . e(route('pedigree', [
@@ -420,7 +420,7 @@  discard block
 block discarded – undo
420 420
 		$html = '';
421 421
 		if ($this->chartHasAncestors) {
422 422
 			if ($this->nodes[$index]['indi'] && $this->nodes[$index]['indi']->getChildFamilies()) {
423
-				$html         .= '<div class="ancestorarrow">';
423
+				$html .= '<div class="ancestorarrow">';
424 424
 				$rootParentId = 1;
425 425
 				if ($index > (int) ($this->treesize / 2) + (int) ($this->treesize / 4)) {
426 426
 					$rootParentId++;
Please login to merge, or discard this patch.