Completed
Pull Request — master (#1872)
by Rico
09:20
created
app/Http/Controllers/SetupController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
     {
48 48
         define('WT_LOCALE', I18N::init('en-US'));
49 49
 
50
-        $step     = (int)$request->get('step', '1');
50
+        $step     = (int) $request->get('step', '1');
51 51
         $errors   = $this->serverErrors();
52 52
         $warnings = $this->serverWarnings();
53 53
         $data     = $this->extractParameters($request);
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
      */
365 365
     private function maxExecutionTime(): int
366 366
     {
367
-        return (int)ini_get('max_execution_time');
367
+        return (int) ini_get('max_execution_time');
368 368
     }
369 369
 
370 370
     /**
@@ -397,7 +397,7 @@  discard block
 block discarded – undo
397 397
                 $memory_limit = $memory_limit / 1024 / 1024;
398 398
         }
399 399
 
400
-        return (int)$memory_limit;
400
+        return (int) $memory_limit;
401 401
     }
402 402
 
403 403
     /**
@@ -454,11 +454,11 @@  discard block
 block discarded – undo
454 454
             /* I18N: a program feature */
455 455
             'simplexml' => I18N::translate('reporting'),
456 456
         ];
457
-        $settings   = [
457
+        $settings = [
458 458
             /* I18N: a program feature */
459 459
             'file_uploads' => I18N::translate('file upload capability'),
460 460
         ];
461
-        $warnings   = [];
461
+        $warnings = [];
462 462
 
463 463
         foreach ($extensions as $extension => $features) {
464 464
             if (!extension_loaded($extension)) {
Please login to merge, or discard this patch.
app/Http/Controllers/HourglassChartController.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -55,15 +55,15 @@  discard block
 block discarded – undo
55 55
 
56 56
         $this->checkIndividualAccess($individual);
57 57
 
58
-        $maximum_generations = (int)$tree->getPreference('MAX_DESCENDANCY_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
59
-        $default_generations = (int)$tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
58
+        $maximum_generations = (int) $tree->getPreference('MAX_DESCENDANCY_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
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);
65 65
 
66
-        $show_spouse = (bool)$request->get('show_spouse');
66
+        $show_spouse = (bool) $request->get('show_spouse');
67 67
 
68 68
         /* I18N: %s is an individual’s name */
69 69
         $title = I18N::translate('Hourglass chart of %s', $individual->getFullName());
@@ -95,14 +95,14 @@  discard block
 block discarded – undo
95 95
 
96 96
         $this->checkIndividualAccess($individual);
97 97
 
98
-        $maximum_generations = (int)$tree->getPreference('MAX_DESCENDANCY_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
99
-        $default_generations = (int)$tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
98
+        $maximum_generations = (int) $tree->getPreference('MAX_DESCENDANCY_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
99
+        $default_generations = (int) $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
100 100
 
101
-        $generations = (int)$request->get('generations', $default_generations);
101
+        $generations = (int) $request->get('generations', $default_generations);
102 102
         $generations = min($generations, $maximum_generations);
103 103
         $generations = max($generations, self::MINIMUM_GENERATIONS);
104 104
 
105
-        $show_spouse = (bool)$request->get('show_spouse');
105
+        $show_spouse = (bool) $request->get('show_spouse');
106 106
 
107 107
         ob_start();
108 108
         $this->printDescendency($individual, 1, $generations, $show_spouse, true);
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
         return new Response(view('hourglass-chart', [
116 116
             'descendants' => $descendants,
117 117
             'ancestors'   => $ancestors,
118
-            'bhalfheight' => (int)(Theme::theme()->parameter('chart-box-y') / 2),
118
+            'bhalfheight' => (int) (Theme::theme()->parameter('chart-box-y') / 2),
119 119
         ]));
120 120
     }
121 121
 
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 
135 135
         $this->checkIndividualAccess($individual);
136 136
 
137
-        $show_spouse = (bool)$request->get('show_spouse');
137
+        $show_spouse = (bool) $request->get('show_spouse');
138 138
 
139 139
         ob_start();
140 140
         $this->printPersonPedigree($individual, 0, 1, $show_spouse);
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
         $xref       = $request->get('xref');
157 157
         $individual = Individual::getInstance($xref, $tree);
158 158
 
159
-        $show_spouse = (bool)$request->get('show_spouse');
159
+        $show_spouse = (bool) $request->get('show_spouse');
160 160
 
161 161
         ob_start();
162 162
         $this->printDescendency($individual, 1, 2, $show_spouse, false);
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
                     echo '<a href="' . e(route('hourglass', [
310 310
                             'xref'        => $spouse->getXref(),
311 311
                             'generations' => $generations,
312
-                            'show_spouse' => (int)$show_spouse,
312
+                            'show_spouse' => (int) $show_spouse,
313 313
                             'ged'         => $spouse->getTree()->getName(),
314 314
                         ])) . '" class="name1">' . $spouse->getFullName() . '</a>';
315 315
                 }
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
                     echo '<a href="' . e(route('hourglass', [
318 318
                             'xref'        => $child->getXref(),
319 319
                             'generations' => $generations,
320
-                            'show_spouse' => (int)$show_spouse,
320
+                            'show_spouse' => (int) $show_spouse,
321 321
                             'ged'         => $child->getTree()->getName(),
322 322
                         ])) . '" class="name1">' . $child->getFullName() . '</a>';
323 323
                 }
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
                         echo '<a href="' . e(route('hourglass', [
333 333
                                 'xref'        => $husb->getXref(),
334 334
                                 'generations' => $generations,
335
-                                'show_spouse' => (int)$show_spouse,
335
+                                'show_spouse' => (int) $show_spouse,
336 336
                                 'ged'         => $husb->getTree()->getName(),
337 337
                             ])) . '" class="name1">' . $husb->getFullName() . '</a>';
338 338
                     }
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
341 341
                         echo '<a href="' . e(route('hourglass', [
342 342
                                 'xref'        => $wife->getXref(),
343 343
                                 'generations' => $generations,
344
-                                'show_spouse' => (int)$show_spouse,
344
+                                'show_spouse' => (int) $show_spouse,
345 345
                                 'ged'         => $wife->getTree()->getName(),
346 346
                             ])) . '" class="name1">' . $wife->getFullName() . '</a>';
347 347
                     }
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
                         echo '<a href="' . e(route('hourglass', [
361 361
                                 'xref'        => $child->getXref(),
362 362
                                 'generations' => $generations,
363
-                                'show_spouse' => (int)$show_spouse,
363
+                                'show_spouse' => (int) $show_spouse,
364 364
                                 'ged'         => $child->getTree()->getName(),
365 365
                             ])) . '" class="name1">' . $child->getFullName() . '</a>';
366 366
                     }
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
                         'href'         => '#',
424 424
                         'data-route'   => 'hourglass-add-asc',
425 425
                         'data-xref'    => $ARID,
426
-                        'data-spouses' => (int)$show_spouse,
426
+                        'data-spouses' => (int) $show_spouse,
427 427
                         'data-tree'    => $family->getHusband()->getTree()->getName(),
428 428
                     ]);
429 429
                 }
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
                         'href'         => '#',
461 461
                         'data-route'   => 'hourglass-add-asc',
462 462
                         'data-xref'    => $ARID,
463
-                        'data-spouses' => (int)$show_spouse,
463
+                        'data-spouses' => (int) $show_spouse,
464 464
                         'data-tree'    => $family->getWife()->getTree()->getName(),
465 465
                     ]);
466 466
                 }
Please login to merge, or discard this patch.
app/Functions/FunctionsPrintFacts.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -176,14 +176,14 @@  discard block
 block discarded – undo
176 176
             case '_BIRT_CHIL':
177 177
                 $children[$fact->getParent()->getXref()] = true;
178 178
                 /* I18N: Abbreviation for "number %s" */
179
-                $label                                   .= '<br>' . I18N::translate('#%s', count($children));
179
+                $label .= '<br>' . I18N::translate('#%s', count($children));
180 180
                 break;
181 181
             case '_BIRT_GCHI':
182 182
             case '_BIRT_GCH1':
183 183
             case '_BIRT_GCH2':
184 184
                 $grandchildren[$fact->getParent()->getXref()] = true;
185 185
                 /* I18N: Abbreviation for "number %s" */
186
-                $label                                        .= '<br>' . I18N::translate('#%s', count($grandchildren));
186
+                $label .= '<br>' . I18N::translate('#%s', count($grandchildren));
187 187
                 break;
188 188
         }
189 189
 
@@ -577,7 +577,7 @@  discard block
 block discarded – undo
577 577
         for ($j = 0; $j < $ct; $j++) {
578 578
             if (strpos($match[$j][1], '@') === false) {
579 579
                 $source = e($match[$j][1] . preg_replace('/\n\d CONT ?/', "\n", $match[$j][2]));
580
-                $data   .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
580
+                $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
581 581
             }
582 582
         }
583 583
         // Find source for each fact
@@ -595,7 +595,7 @@  discard block
 block discarded – undo
595 595
                     }
596 596
                     $srec      = substr($factrec, $spos1, $spos2 - $spos1);
597 597
                     $lt        = preg_match_all("/$nlevel \w+/", $srec, $matches);
598
-                    $data      .= '<div class="fact_SOUR">';
598
+                    $data .= '<div class="fact_SOUR">';
599 599
                     $elementID = Uuid::uuid4()->toString();
600 600
                     if ($tree->getPreference('EXPAND_SOURCES')) {
601 601
                         $plusminus = 'icon-minus';
Please login to merge, or discard this patch.
app/Module/BatchUpdate/BatchUpdateSearchReplacePlugin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@
 block discarded – undo
175 175
             'words'     => I18N::translate('Match the exact text, unless it occurs in the middle of a word.'),
176 176
             'wildcards' => I18N::translate('Use a “?” to match a single character, use “*” to match zero or more characters.'),
177 177
             /* I18N: http://en.wikipedia.org/wiki/Regular_expression */
178
-            'regex'     => I18N::translate('Regular expressions are an advanced pattern matching technique.') . '<br>' .  I18N::translate('See %s for more information.', '<a href="http://php.net/manual/regexp.reference.php">php.net/manual/regexp.reference.php</a>'),
178
+            'regex'     => I18N::translate('Regular expressions are an advanced pattern matching technique.') . '<br>' . I18N::translate('See %s for more information.', '<a href="http://php.net/manual/regexp.reference.php">php.net/manual/regexp.reference.php</a>'),
179 179
         ];
180 180
 
181 181
         return
Please login to merge, or discard this patch.
app/Http/Controllers/LifespansChartController.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
     {
53 53
         $this->checkModuleIsActive($tree, 'lifespans_chart');
54 54
 
55
-        $xrefs     = (array)$request->get('xrefs', []);
55
+        $xrefs     = (array) $request->get('xrefs', []);
56 56
         $addxref   = $request->get('addxref', '');
57
-        $addfam    = (bool)$request->get('addfam', false);
57
+        $addfam    = (bool) $request->get('addfam', false);
58 58
         $placename = $request->get('placename', '');
59 59
         $start     = $request->get('start', '');
60 60
         $end       = $request->get('end', '');
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
     {
112 112
         $this->checkModuleIsActive($tree, 'lifespans_chart');
113 113
 
114
-        $xrefs = (array)$request->get('xrefs', []);
114
+        $xrefs = (array) $request->get('xrefs', []);
115 115
         $xrefs = array_unique($xrefs);
116 116
 
117 117
         /** @var Individual[] $individuals */
@@ -131,8 +131,8 @@  discard block
 block discarded – undo
131 131
         $subtitle = $request->get('subtitle');
132 132
 
133 133
         // Round to whole decades
134
-        $start_year = (int)floor($this->minYear($individuals) / 10) * 10;
135
-        $end_year   = (int)ceil($this->maxYear($individuals) / 10) * 10;
134
+        $start_year = (int) floor($this->minYear($individuals) / 10) * 10;
135
+        $end_year   = (int) ceil($this->maxYear($individuals) / 10) * 10;
136 136
 
137 137
         $lifespans = $this->layoutIndividuals($individuals);
138 138
 
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
             'U' => new ColorGenerator(120, self::SATURATION, self::LIGHTNESS, self::ALPHA, self::RANGE),
168 168
         ];
169 169
 
170
-        $current_year = (int)date('Y');
170
+        $current_year = (int) date('Y');
171 171
 
172 172
         // Latest year used in each row
173 173
         $rows = [];
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
             // Fill the row up to the year (leaving a small gap)
197 197
             $rows[$next_row] = $death_year;
198 198
 
199
-            $lifespans[] = (object)[
199
+            $lifespans[] = (object) [
200 200
                 'background' => $colors[$individual->getSex()]->getNextColor(),
201 201
                 'birth_year' => $birth_year,
202 202
                 'death_year' => $death_year,
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
         $year = $this->jdToYear($jd);
226 226
 
227 227
         // Don't show future dates
228
-        return min($year, (int)date('Y'));
228
+        return min($year, (int) date('Y'));
229 229
     }
230 230
 
231 231
     /**
Please login to merge, or discard this patch.
app/Http/Controllers/Auth/RegisterController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
             ->setPreference('sessiontime', '0');
119 119
 
120 120
         // Create a dummy user, so we can send messages from the tree.
121
-        $sender = new User((object)[
121
+        $sender = new User((object) [
122 122
             'user_id'   => null,
123 123
             'user_name' => '',
124 124
             'real_name' => $tree->getTitle(),
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
         );
138 138
 
139 139
         // Tell the genealogy contact about the registration.
140
-        $webmaster = User::find((int)$tree->getPreference('WEBMASTER_USER_ID'));
140
+        $webmaster = User::find((int) $tree->getPreference('WEBMASTER_USER_ID'));
141 141
 
142 142
         if ($webmaster !== null) {
143 143
             I18N::init($webmaster->getPreference('language'));
Please login to merge, or discard this patch.
app/Http/Controllers/FanChartController.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -62,9 +62,9 @@  discard block
 block discarded – undo
62 62
 
63 63
         $this->checkIndividualAccess($individual);
64 64
 
65
-        $chart_style = (int)$request->get('chart_style', self::DEFAULT_STYLE);
66
-        $fan_width   = (int)$request->get('fan_width', self::DEFAULT_WIDTH);
67
-        $generations = (int)$request->get('generations', self::DEFAULT_GENERATIONS);
65
+        $chart_style = (int) $request->get('chart_style', self::DEFAULT_STYLE);
66
+        $fan_width   = (int) $request->get('fan_width', self::DEFAULT_WIDTH);
67
+        $generations = (int) $request->get('generations', self::DEFAULT_GENERATIONS);
68 68
 
69 69
         $fan_width = min($fan_width, self::MAXIMUM_WIDTH);
70 70
         $fan_width = max($fan_width, self::MINIMUM_WIDTH);
@@ -106,9 +106,9 @@  discard block
 block discarded – undo
106 106
 
107 107
         $this->checkIndividualAccess($individual);
108 108
 
109
-        $chart_style = (int)$request->get('chart_style', self::DEFAULT_STYLE);
110
-        $fan_width   = (int)$request->get('fan_width', self::DEFAULT_WIDTH);
111
-        $generations = (int)$request->get('generations', self::DEFAULT_GENERATIONS);
109
+        $chart_style = (int) $request->get('chart_style', self::DEFAULT_STYLE);
110
+        $fan_width   = (int) $request->get('fan_width', self::DEFAULT_WIDTH);
111
+        $generations = (int) $request->get('generations', self::DEFAULT_GENERATIONS);
112 112
 
113 113
         $fan_width = min($fan_width, self::MAXIMUM_WIDTH);
114 114
         $fan_width = max($fan_width, self::MINIMUM_WIDTH);
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
         $scale = $fanw / 640;
138 138
 
139 139
         // Create the image
140
-        $image = imagecreate((int)$fanw, (int)$fanh);
140
+        $image = imagecreate((int) $fanw, (int) $fanh);
141 141
 
142 142
         // Create colors
143 143
         $transparent = imagecolorallocate($image, 0, 0, 0);
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
         ];
155 155
 
156 156
 
157
-        imagefilledrectangle($image, 0, 0, (int)$fanw, (int)$fanh, $transparent);
157
+        imagefilledrectangle($image, 0, 0, (int) $fanw, (int) $fanh, $transparent);
158 158
 
159 159
         $fandeg = 90 * $chart_style;
160 160
 
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
             // clean current generation area
170 170
             $deg2 = 360 + ($fandeg - 180) / 2;
171 171
             $deg1 = $deg2 - $fandeg;
172
-            imagefilledarc($image, (int)$cx, (int)$cy, (int)$rx, (int)$rx, (int)$deg1, (int)$deg2, $backgrounds['U'], IMG_ARC_PIE);
172
+            imagefilledarc($image, (int) $cx, (int) $cy, (int) $rx, (int) $rx, (int) $deg1, (int) $deg2, $backgrounds['U'], IMG_ARC_PIE);
173 173
             $rx -= 3;
174 174
 
175 175
             // calculate new angle
@@ -199,15 +199,15 @@  discard block
 block discarded – undo
199 199
 
200 200
                     $background = $backgrounds[$person->getSex()];
201 201
 
202
-                    imagefilledarc($image, (int)$cx, (int)$cy, (int)$rx, (int)$rx, (int)$deg1, (int)$deg2, $background, IMG_ARC_PIE);
202
+                    imagefilledarc($image, (int) $cx, (int) $cy, (int) $rx, (int) $rx, (int) $deg1, (int) $deg2, $background, IMG_ARC_PIE);
203 203
 
204 204
                     // split and center text by lines
205
-                    $wmax = (int)($angle * 7 / 7 * $scale);
205
+                    $wmax = (int) ($angle * 7 / 7 * $scale);
206 206
                     $wmax = min($wmax, 35 * $scale);
207 207
                     if ($gen == 0) {
208 208
                         $wmax = min($wmax, 17 * $scale);
209 209
                     }
210
-                    $text = $this->splitAlignText($text, (int)$wmax);
210
+                    $text = $this->splitAlignText($text, (int) $wmax);
211 211
 
212 212
                     // text angle
213 213
                     $tangle = 270 - ($deg1 + $angle / 2);
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
376 376
                     }
377 377
                     $line .= "$word";
378 378
                 } else {
379
-                    $p = max(0, (int)(($maxlen - $len) / 2));
379
+                    $p = max(0, (int) (($maxlen - $len) / 2));
380 380
                     if (!empty($line)) {
381 381
                         $line = str_repeat(' ', $p) . $line; // center alignment using spaces
382 382
                         $text .= $line . "\n";
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
             if (in_array(ord($line{0}), $RTLOrd)) {
392 392
                 $len /= 2;
393 393
             }
394
-            $p    = max(0, (int)(($maxlen - $len) / 2));
394
+            $p    = max(0, (int) (($maxlen - $len) / 2));
395 395
             $line = str_repeat(' ', $p) . $line; // center alignment using spaces
396 396
             $text .= $line;
397 397
         }
@@ -411,9 +411,9 @@  discard block
 block discarded – undo
411 411
     {
412 412
         return imagecolorallocate(
413 413
             $image,
414
-            (int)hexdec(substr($css_color, 0, 2)),
415
-            (int)hexdec(substr($css_color, 2, 2)),
416
-            (int)hexdec(substr($css_color, 4, 2))
414
+            (int) hexdec(substr($css_color, 0, 2)),
415
+            (int) hexdec(substr($css_color, 2, 2)),
416
+            (int) hexdec(substr($css_color, 4, 2))
417 417
         );
418 418
     }
419 419
 
Please login to merge, or discard this patch.
app/Http/Controllers/StatisticsChartController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -576,7 +576,7 @@  discard block
 block discarded – undo
576 576
                         $z_axis = $this->axisAll();
577 577
                         // The stats query doesn't have an "all" function, so query M/F/U separately
578 578
                         foreach (['M', 'F', 'U'] as $sex) {
579
-                            $rows  = $stats->statsMarrAgeQuery(false, $sex);
579
+                            $rows = $stats->statsMarrAgeQuery(false, $sex);
580 580
                             $indi = [];
581 581
                             foreach ($rows as $row) {
582 582
                                 if (!in_array($row->d_gid, $indi)) {
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
589 589
                     case self::Z_AXIS_SEX:
590 590
                         $z_axis = $this->axisSexes();
591 591
                         foreach (array_keys($z_axis) as $sex) {
592
-                            $rows  = $stats->statsMarrAgeQuery(false, $sex);
592
+                            $rows = $stats->statsMarrAgeQuery(false, $sex);
593 593
                             $indi = [];
594 594
                             foreach ($rows as $row) {
595 595
                                 if (!in_array($row->d_gid, $indi)) {
@@ -605,7 +605,7 @@  discard block
 block discarded – undo
605 605
                         // The stats query doesn't have an "all" function, so query M/F/U separately
606 606
                         foreach (['M', 'F', 'U'] as $sex) {
607 607
                             $prev_boundary = 0;
608
-                            $indi   = [];
608
+                            $indi = [];
609 609
                             foreach (array_keys($z_axis) as $boundary) {
610 610
                                 $rows = $stats->statsMarrAgeQuery(false, $sex, $prev_boundary, $boundary);
611 611
                                 foreach ($rows as $row) {
Please login to merge, or discard this patch.
app/Http/Controllers/AdminController.php 1 patch
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
             $user_list[$tmp_user->getUserName()] = $tmp_user->getUserName();
166 166
         }
167 167
 
168
-        $action   = $request->get('action');
168
+        $action = $request->get('action');
169 169
 
170 170
         // @TODO This ought to be a POST action
171 171
         if ($action === 'delete') {
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
      */
232 232
     public function changesLogData(Request $request): Response
233 233
     {
234
-        list($select, , $where, $args1) = $this->changesQuery($request);
234
+        list($select,, $where, $args1) = $this->changesQuery($request);
235 235
         list($order_by, $limit, $args2) = $this->dataTablesPagination($request);
236 236
 
237 237
         $rows = Database::prepare(
@@ -239,8 +239,8 @@  discard block
 block discarded – undo
239 239
         )->execute(array_merge($args1, $args2))->fetchAll();
240 240
 
241 241
         // Total filtered/unfiltered rows
242
-        $recordsFiltered = (int)Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
243
-        $recordsTotal    = (int)Database::prepare("SELECT COUNT(*) FROM `##change`")->fetchOne();
242
+        $recordsFiltered = (int) Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
243
+        $recordsTotal    = (int) Database::prepare("SELECT COUNT(*) FROM `##change`")->fetchOne();
244 244
 
245 245
         $data      = [];
246 246
         $algorithm = new MyersDiff();
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
 
292 292
         // See http://www.datatables.net/usage/server-side
293 293
         return new JsonResponse([
294
-            'draw'            => (int)$request->get('draw'),
294
+            'draw'            => (int) $request->get('draw'),
295 295
             'recordsTotal'    => $recordsTotal,
296 296
             'recordsFiltered' => $recordsFiltered,
297 297
             'data'            => $data,
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
      */
308 308
     public function changesLogDownload(Request $request): Response
309 309
     {
310
-        list($select, , $where, $args) = $this->changesQuery($request);
310
+        list($select,, $where, $args) = $this->changesQuery($request);
311 311
 
312 312
         $rows = Database::prepare($select . $where)->execute($args)->fetchAll();
313 313
 
@@ -449,8 +449,8 @@  discard block
 block discarded – undo
449 449
             'RESN',
450 450
         ];
451 451
 
452
-        $start  = (int)$request->get('start', 0);
453
-        $length = (int)$request->get('length', 20);
452
+        $start  = (int) $request->get('start', 0);
453
+        $length = (int) $request->get('length', 20);
454 454
         $search = $request->get('search', []);
455 455
         $search = $search['value'] ?? '';
456 456
 
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
         $args  = [];
471 471
 
472 472
         if ($search !== '') {
473
-            $where           .= " AND (multimedia_file_refn LIKE CONCAT('%', :search1, '%') OR multimedia_file_refn LIKE CONCAT('%', :search2, '%'))";
473
+            $where .= " AND (multimedia_file_refn LIKE CONCAT('%', :search1, '%') OR multimedia_file_refn LIKE CONCAT('%', :search2, '%'))";
474 474
             $args['search1'] = $search;
475 475
             $args['search2'] = $search;
476 476
         }
@@ -489,8 +489,8 @@  discard block
 block discarded – undo
489 489
         )->fetchAll();
490 490
 
491 491
         // Total filtered/unfiltered rows
492
-        $recordsFiltered = (int)Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
493
-        $recordsTotal    = (int)Database::prepare($select2)->fetchOne();
492
+        $recordsFiltered = (int) Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
493
+        $recordsTotal    = (int) Database::prepare($select2)->fetchOne();
494 494
 
495 495
         // Turn each row from the query into a row for the table
496 496
         $data = array_map(function (stdClass $datum) use ($ignore_facts) {
@@ -532,7 +532,7 @@  discard block
 block discarded – undo
532 532
         }, $data);
533 533
 
534 534
         return new JsonResponse([
535
-            'draw'            => (int)$request->get('draw'),
535
+            'draw'            => (int) $request->get('draw'),
536 536
             'recordsTotal'    => $recordsTotal,
537 537
             'recordsFiltered' => $recordsFiltered,
538 538
             'data'            => $data,
@@ -621,8 +621,8 @@  discard block
 block discarded – undo
621 621
      */
622 622
     public function webtrees1ThumbnailsData(Request $request): JsonResponse
623 623
     {
624
-        $start  = (int)$request->get('start', 0);
625
-        $length = (int)$request->get('length', 20);
624
+        $start  = (int) $request->get('start', 0);
625
+        $length = (int) $request->get('length', 20);
626 626
         $search = $request->get('search', []);
627 627
         $search = $search['value'] ?? '';
628 628
 
@@ -653,7 +653,7 @@  discard block
 block discarded – undo
653 653
         $data = array_map(function (string $thumbnail) {
654 654
             $original = $this->findOriginalFileFromThumbnail($thumbnail);
655 655
 
656
-            $original_url  = route('unused-media-thumbnail', [
656
+            $original_url = route('unused-media-thumbnail', [
657 657
                 'folder' => dirname($original),
658 658
                 'file'   => basename($original),
659 659
                 'w'      => 100,
@@ -695,7 +695,7 @@  discard block
 block discarded – undo
695 695
         }, $thumbnails);
696 696
 
697 697
         return new JsonResponse([
698
-            'draw'            => (int)$request->get('draw'),
698
+            'draw'            => (int) $request->get('draw'),
699 699
             'recordsTotal'    => $recordsTotal,
700 700
             'recordsFiltered' => $recordsFiltered,
701 701
             'data'            => $data,
@@ -1021,7 +1021,7 @@  discard block
 block discarded – undo
1021 1021
      */
1022 1022
     public function treePrivacyUpdate(Request $request, Tree $tree): RedirectResponse
1023 1023
     {
1024
-        foreach ((array)$request->get('delete') as $default_resn_id) {
1024
+        foreach ((array) $request->get('delete') as $default_resn_id) {
1025 1025
             Database::prepare(
1026 1026
                 "DELETE FROM `##default_resn` WHERE default_resn_id = :default_resn_id"
1027 1027
             )->execute([
@@ -1029,13 +1029,13 @@  discard block
 block discarded – undo
1029 1029
             ]);
1030 1030
         }
1031 1031
 
1032
-        $xrefs     = (array)$request->get('xref');
1033
-        $tag_types = (array)$request->get('tag_type');
1034
-        $resns     = (array)$request->get('resn');
1032
+        $xrefs     = (array) $request->get('xref');
1033
+        $tag_types = (array) $request->get('tag_type');
1034
+        $resns     = (array) $request->get('resn');
1035 1035
 
1036 1036
         foreach ($xrefs as $n => $xref) {
1037
-            $tag_type = (string)$tag_types[$n];
1038
-            $resn     = (string)$resns[$n];
1037
+            $tag_type = (string) $tag_types[$n];
1038
+            $resn     = (string) $resns[$n];
1039 1039
 
1040 1040
             if ($tag_type !== '' || $xref !== '') {
1041 1041
                 // Delete any existing data
@@ -1081,10 +1081,10 @@  discard block
 block discarded – undo
1081 1081
         FlashMessages::addMessage(I18N::translate('The preferences for the family tree “%s” have been updated.', e($tree->getTitle()), 'success'));
1082 1082
 
1083 1083
         // Coming soon...
1084
-        if ((bool)$request->get('all_trees')) {
1084
+        if ((bool) $request->get('all_trees')) {
1085 1085
             FlashMessages::addMessage(I18N::translate('The preferences for all family trees have been updated.', e($tree->getTitle())), 'success');
1086 1086
         }
1087
-        if ((bool)$request->get('new_trees')) {
1087
+        if ((bool) $request->get('new_trees')) {
1088 1088
             FlashMessages::addMessage(I18N::translate('The preferences for new family trees have been updated.', e($tree->getTitle())), 'success');
1089 1089
         }
1090 1090
 
@@ -1107,7 +1107,7 @@  discard block
 block discarded – undo
1107 1107
         foreach ($modules as $module) {
1108 1108
             foreach (Tree::getAll() as $tree) {
1109 1109
                 $key          = 'access-' . $module->getName() . '-' . $tree->getTreeId();
1110
-                $access_level = (int)$request->get($key, $module->defaultAccessLevel());
1110
+                $access_level = (int) $request->get($key, $module->defaultAccessLevel());
1111 1111
 
1112 1112
                 Database::prepare("REPLACE INTO `##module_privacy` (module_name, gedcom_id, component, access_level) VALUES (:module_name, :tree_id, :component, :access_level)")->execute([
1113 1113
                     'module_name'  => $module->getName(),
@@ -1134,7 +1134,7 @@  discard block
 block discarded – undo
1134 1134
         $module_status = Database::prepare("SELECT module_name, status FROM `##module`")->fetchAssoc();
1135 1135
 
1136 1136
         foreach ($modules as $module) {
1137
-            $new_status = (bool)$request->get('status-' . $module->getName()) ? 'enabled' : 'disabled';
1137
+            $new_status = (bool) $request->get('status-' . $module->getName()) ? 'enabled' : 'disabled';
1138 1138
             $old_status = $module_status[$module->getName()];
1139 1139
 
1140 1140
             if ($new_status !== $old_status) {
@@ -1197,36 +1197,36 @@  discard block
 block discarded – undo
1197 1197
         $where = ' WHERE 1';
1198 1198
         $args  = [];
1199 1199
         if ($search !== '') {
1200
-            $where            .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))";
1200
+            $where .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))";
1201 1201
             $args['search_1'] = $search;
1202 1202
             $args['search_2'] = $search;
1203 1203
         }
1204 1204
         if ($from !== '') {
1205
-            $where        .= " AND change_time >= :from";
1205
+            $where .= " AND change_time >= :from";
1206 1206
             $args['from'] = $from;
1207 1207
         }
1208 1208
         if ($to !== '') {
1209
-            $where      .= ' AND change_time < TIMESTAMPADD(DAY, 1 , :to)'; // before end of the day
1209
+            $where .= ' AND change_time < TIMESTAMPADD(DAY, 1 , :to)'; // before end of the day
1210 1210
             $args['to'] = $to;
1211 1211
         }
1212 1212
         if ($type !== '') {
1213
-            $where          .= ' AND status = :status';
1213
+            $where .= ' AND status = :status';
1214 1214
             $args['status'] = $type;
1215 1215
         }
1216 1216
         if ($oldged !== '') {
1217
-            $where           .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')";
1217
+            $where .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')";
1218 1218
             $args['old_ged'] = $oldged;
1219 1219
         }
1220 1220
         if ($newged !== '') {
1221
-            $where           .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')";
1221
+            $where .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')";
1222 1222
             $args['new_ged'] = $newged;
1223 1223
         }
1224 1224
         if ($xref !== '') {
1225
-            $where        .= " AND xref = :xref";
1225
+            $where .= " AND xref = :xref";
1226 1226
             $args['xref'] = $xref;
1227 1227
         }
1228 1228
         if ($username !== '') {
1229
-            $where        .= " AND user_name LIKE CONCAT('%', :user, '%')";
1229
+            $where .= " AND user_name LIKE CONCAT('%', :user, '%')";
1230 1230
             $args['user'] = $username;
1231 1231
         }
1232 1232
         if ($ged !== '') {
@@ -1277,8 +1277,8 @@  discard block
 block discarded – undo
1277 1277
      */
1278 1278
     private function dataTablesPagination(Request $request): array
1279 1279
     {
1280
-        $start  = (int)$request->get('start', '0');
1281
-        $length = (int)$request->get('length', '0');
1280
+        $start  = (int) $request->get('start', '0');
1281
+        $length = (int) $request->get('length', '0');
1282 1282
         $order  = $request->get('order', []);
1283 1283
         $args   = [];
1284 1284
 
@@ -1429,7 +1429,7 @@  discard block
 block discarded – undo
1429 1429
         }
1430 1430
 
1431 1431
         // The maximum difference is 255 (black versus white).
1432
-        return 100 - (int)($max_difference * 100 / 255);
1432
+        return 100 - (int) ($max_difference * 100 / 255);
1433 1433
     }
1434 1434
 
1435 1435
     /**
@@ -1460,7 +1460,7 @@  discard block
 block discarded – undo
1460 1460
             $pixels[$x] = [];
1461 1461
             for ($y = 0; $y < $size; ++$y) {
1462 1462
                 $pixel          = $image->pickColor($x, $y);
1463
-                $pixels[$x][$y] = (int)(($pixel[0] + $pixel[1] + $pixel[2]) / 3);
1463
+                $pixels[$x][$y] = (int) (($pixel[0] + $pixel[1] + $pixel[2]) / 3);
1464 1464
             }
1465 1465
         }
1466 1466
 
Please login to merge, or discard this patch.