Completed
Pull Request — master (#1904)
by Rico
12:08
created
app/Http/Controllers/AdminPhpGedViewController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -336,7 +336,7 @@
 block discarded – undo
336 336
         $INDEX_DIRECTORY    = $config['INDEX_DIRECTORY'];
337 337
         $DBNAME             = $config['DBNAME'];
338 338
         $TBLPREFIX          = $config['TBLPREFIX'];
339
-        $PGV_SCHEMA_VERSION = (int)($config['PGV_SCHEMA_VERSION'] ?? '0');
339
+        $PGV_SCHEMA_VERSION = (int) ($config['PGV_SCHEMA_VERSION'] ?? '0');
340 340
 
341 341
         // Delete the existing user accounts, and any information associated with it
342 342
         Database::exec("UPDATE `##log` SET user_id=NULL");
Please login to merge, or discard this patch.
app/Http/Controllers/FamilyBookChartController.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -55,16 +55,16 @@  discard block
 block discarded – undo
55 55
         $this->checkIndividualAccess($individual);
56 56
 
57 57
         $minimum_generations = 2;
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
-        $show_spouse = (bool)$request->get('show_spouse');
62
-        $generations = (int)$request->get('generations', $default_generations);
61
+        $show_spouse = (bool) $request->get('show_spouse');
62
+        $generations = (int) $request->get('generations', $default_generations);
63 63
         $generations = min($generations, $maximum_generations);
64 64
         $generations = max($generations, $minimum_generations);
65 65
 
66 66
         // Generations of ancestors/descendants in each mini-tree.
67
-        $book_size = (int)$request->get('book_size', 2);
67
+        $book_size = (int) $request->get('book_size', 2);
68 68
         $book_size = min($book_size, 5);
69 69
         $book_size = max($book_size, 2);
70 70
 
@@ -101,20 +101,20 @@  discard block
 block discarded – undo
101 101
         $this->checkIndividualAccess($individual);
102 102
 
103 103
         $minimum_generations = 2;
104
-        $maximum_generations = (int)$tree->getPreference('MAX_PEDIGREE_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
105
-        $default_generations = (int)$tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
104
+        $maximum_generations = (int) $tree->getPreference('MAX_PEDIGREE_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
105
+        $default_generations = (int) $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
106 106
 
107
-        $book_size   = (int)$request->get('book_size', 2);
108
-        $show_spouse = (bool)$request->get('show_spouse');
107
+        $book_size   = (int) $request->get('book_size', 2);
108
+        $show_spouse = (bool) $request->get('show_spouse');
109 109
 
110
-        $generations = (int)$request->get('generations', $default_generations);
110
+        $generations = (int) $request->get('generations', $default_generations);
111 111
         $generations = min($generations, $maximum_generations);
112 112
         $generations = max($generations, $minimum_generations);
113 113
         $descendants = $this->descendants($individual, $generations, []);
114 114
 
115 115
         // @TODO - this is just a wrapper around the old code.
116 116
         ob_start();
117
-        $this->box = (object)[
117
+        $this->box = (object) [
118 118
             'width'  => Theme::theme()->parameter('chart-box-x'),
119 119
             'height' => Theme::theme()->parameter('chart-box-y'),
120 120
         ];
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
                 echo '<table cellspacing="0" cellpadding="0" border="0" >';
174 174
                 foreach ($children as $i => $child) {
175 175
                     echo '<tr><td>';
176
-                    $kids    = $this->printDescendency($child, $generation + 1);
176
+                    $kids = $this->printDescendency($child, $generation + 1);
177 177
                     $numkids += $kids;
178 178
                     echo '</td>';
179 179
                     // Print the lines
Please login to merge, or discard this patch.
app/Http/Controllers/EditMediaController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -512,7 +512,7 @@
 block discarded – undo
512 512
     private function maxUploadFilesize(): string
513 513
     {
514 514
         $bytes = UploadedFile::getMaxFilesize();
515
-        $kb    = (int)($bytes / 1024);
515
+        $kb    = (int) ($bytes / 1024);
516 516
 
517 517
         return I18N::translate('%s KB', I18N::number($kb));
518 518
     }
Please login to merge, or discard this patch.
app/Http/Controllers/CalendarController.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -528,7 +528,7 @@
 block discarded – undo
528 528
         $html = '';
529 529
 
530 530
         foreach ($list as $id => $facts) {
531
-            $tmp  = GedcomRecord::getInstance($id, $tree);
531
+            $tmp = GedcomRecord::getInstance($id, $tree);
532 532
             $html .= $tag1 . '<a href="' . e($tmp->url()) . '">' . $tmp->getFullName() . '</a> ';
533 533
             $html .= '<div class="indent">' . $facts . '</div>' . $tag2;
534 534
         }
Please login to merge, or discard this patch.
Upper-Lower-Casing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -72,14 +72,14 @@  discard block
 block discarded – undo
72 72
             if (strlen($match[1]) > strlen($match[2])) {
73 73
                 $match[2] = substr($match[1], 0, strlen($match[1]) - strlen($match[2])) . $match[2];
74 74
             }
75
-            $ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}");
75
+            $ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}");
76 76
             $view     = 'year';
77 77
         } else {
78 78
             // advanced-year "decade/century wildcard"
79 79
             if (preg_match('/^(\d+)(\?+)$/', $year, $match)) {
80 80
                 $y1       = $match[1] . str_replace('?', '0', $match[2]);
81 81
                 $y2       = $match[1] . str_replace('?', '9', $match[2]);
82
-                $ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}");
82
+                $ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}");
83 83
                 $view     = 'year';
84 84
             } else {
85 85
                 if ($year < 0) {
@@ -191,14 +191,14 @@  discard block
 block discarded – undo
191 191
             if (strlen($match[1]) > strlen($match[2])) {
192 192
                 $match[2] = substr($match[1], 0, strlen($match[1]) - strlen($match[2])) . $match[2];
193 193
             }
194
-            $ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}");
194
+            $ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}");
195 195
             $view     = 'year';
196 196
         } else {
197 197
             // advanced-year "decade/century wildcard"
198 198
             if (preg_match('/^(\d+)(\?+)$/', $year, $match)) {
199 199
                 $y1       = $match[1] . str_replace('?', '0', $match[2]);
200 200
                 $y2       = $match[1] . str_replace('?', '9', $match[2]);
201
-                $ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}");
201
+                $ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}");
202 202
                 $view     = 'year';
203 203
             } else {
204 204
                 if ($year < 0) {
Please login to merge, or discard this patch.
app/Http/Controllers/UserController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
      */
42 42
     public function delete(Request $request): Response
43 43
     {
44
-        $user_id = (int)$request->get('user_id');
44
+        $user_id = (int) $request->get('user_id');
45 45
 
46 46
         $user = User::find($user_id);
47 47
 
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
      */
81 81
     public function masquerade(Request $request): Response
82 82
     {
83
-        $user_id = (int)$request->get('user_id');
83
+        $user_id = (int) $request->get('user_id');
84 84
 
85 85
         $user = User::find($user_id);
86 86
 
Please login to merge, or discard this patch.
app/Http/Controllers/DescendantsChartController.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -187,8 +187,8 @@  discard block
 block discarded – undo
187 187
         foreach ($person->getChildFamilies() as $cfamily) {
188 188
             foreach ($cfamily->getSpouses() as $parent) {
189 189
                 echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged'         => $parent->getTree()->getName(),
190
-                                                                                                                             'xref'        => $parent->getXref(),
191
-                                                                                                                             'generations' => $generations,
190
+                                                                                                                                'xref'        => $parent->getXref(),
191
+                                                                                                                                'generations' => $generations,
192 192
                 ]),
193 193
                 ]);
194 194
                 // only show the arrow for one of the parents
@@ -268,8 +268,8 @@  discard block
 block discarded – undo
268 268
             foreach ($spouse->getChildFamilies() as $cfamily) {
269 269
                 foreach ($cfamily->getSpouses() as $parent) {
270 270
                     echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged'         => $parent->getTree()->getName(),
271
-                                                                                                                                 'xref'        => $parent->getXref(),
272
-                                                                                                                                 'generations' => $generations,
271
+                                                                                                                                    'xref'        => $parent->getXref(),
272
+                                                                                                                                    'generations' => $generations,
273 273
                     ]),
274 274
                     ]);
275 275
                     // only show the arrow for one of the parents
Please login to merge, or discard this patch.
app/Http/Controllers/IndividualController.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -327,8 +327,8 @@  discard block
 block discarded – undo
327 327
                 FontAwesome::linkIcon('edit', I18N::translate('Edit the name'), [
328 328
                     'class' => 'btn btn-link',
329 329
                     'href'  => route('edit-name', ['xref'    => $individual->getXref(),
330
-                                                   'fact_id' => $fact->getFactId(),
331
-                                                   'ged'     => $individual->getTree()->getName(),
330
+                                                    'fact_id' => $fact->getFactId(),
331
+                                                    'ged'     => $individual->getTree()->getName(),
332 332
                     ]),
333 333
                 ]);
334 334
         } else {
@@ -381,8 +381,8 @@  discard block
 block discarded – undo
381 381
             $edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), [
382 382
                 'class' => 'btn btn-link',
383 383
                 'href'  => route('edit-fact', ['xref'    => $individual->getXref(),
384
-                                               'fact_id' => $fact->getFactId(),
385
-                                               'ged'     => $individual->getTree()->getName(),
384
+                                                'fact_id' => $fact->getFactId(),
385
+                                                'ged'     => $individual->getTree()->getName(),
386 386
                 ]),
387 387
             ]);
388 388
         } else {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -440,7 +440,7 @@
 block discarded – undo
440 440
      */
441 441
     private function significant(Individual $individual): stdClass
442 442
     {
443
-        $significant = (object)[
443
+        $significant = (object) [
444 444
             'family'     => null,
445 445
             'individual' => $individual,
446 446
             'surname'    => '',
Please login to merge, or discard this patch.
app/Module/MissingFactsReportModule.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
         return new Menu(
66 66
             $this->getTitle(),
67 67
             route('report-setup', ['ged'    => $tree->getName(),
68
-                                   'report' => $this->getName(),
68
+                                    'report' => $this->getName(),
69 69
             ]),
70 70
             'menu-report-' . $this->getName(),
71 71
             ['rel' => 'nofollow']
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-declare(strict_types = 1);
2
+declare(strict_types=1);
3 3
 /**
4 4
  * webtrees: online genealogy
5 5
  * Copyright (C) 2018 webtrees development team
Please login to merge, or discard this patch.
app/Module/FamilyBookChartModule.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
         return new Menu(
72 72
             $this->getTitle(),
73 73
             route('family-book', ['ged'  => $individual->getTree()->getName(),
74
-                                  'xref' => $individual->getXref(),
74
+                                    'xref' => $individual->getXref(),
75 75
             ]),
76 76
             'menu-chart-familybook',
77 77
             ['rel' => 'nofollow']
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-declare(strict_types = 1);
2
+declare(strict_types=1);
3 3
 /**
4 4
  * webtrees: online genealogy
5 5
  * Copyright (C) 2018 webtrees development team
Please login to merge, or discard this patch.