Completed
Pull Request — master (#2064)
by Rico
06:52
created
app/MediaFile.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -224,10 +224,10 @@
 block discarded – undo
224 224
             $src    = $this->imageUrl($width, $height, $fit);
225 225
             $srcset = [];
226 226
             foreach ([
227
-                         2,
228
-                         3,
229
-                         4,
230
-                     ] as $x) {
227
+                            2,
228
+                            3,
229
+                            4,
230
+                        ] as $x) {
231 231
                 $srcset[] = $this->imageUrl($width * $x, $height * $x, $fit) . ' ' . $x . 'x';
232 232
             }
233 233
         }
Please login to merge, or discard this patch.
app/Functions/FunctionsPrint.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -345,10 +345,10 @@
 block discarded – undo
345 345
         }
346 346
         // print gedcom ages
347 347
         foreach ([
348
-             I18N::translate('Age')     => $fact_age,
349
-             I18N::translate('Husband') => $husb_age,
350
-             I18N::translate('Wife')    => $wife_age,
351
-         ] as $label => $age) {
348
+                I18N::translate('Age')     => $fact_age,
349
+                I18N::translate('Husband') => $husb_age,
350
+                I18N::translate('Wife')    => $wife_age,
351
+            ] as $label => $age) {
352 352
             if ($age != '') {
353 353
                 $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>';
354 354
             }
Please login to merge, or discard this patch.
app/Http/Controllers/HomePageController.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -840,9 +840,9 @@
 block discarded – undo
840 840
         }
841 841
 
842 842
         foreach ([
843
-             'main' => $main_blocks,
844
-             'side' => $side_blocks,
845
-         ] as $location => $updated_blocks) {
843
+                'main' => $main_blocks,
844
+                'side' => $side_blocks,
845
+            ] as $location => $updated_blocks) {
846 846
             foreach ($updated_blocks as $block_order => $block_id) {
847 847
                 if (is_numeric($block_id)) {
848 848
                     // Updated block
Please login to merge, or discard this patch.
app/Http/Controllers/PendingChangesController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
     {
99 99
         $url       = $request->get('url', '');
100 100
         $xref      = $request->get('xref', '');
101
-        $change_id = (int)$request->get('change_id');
101
+        $change_id = (int) $request->get('change_id');
102 102
 
103 103
         $changes = Database::prepare(
104 104
             "SELECT change_id, xref, old_gedcom, new_gedcom" .
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
     {
205 205
         $url       = $request->get('url', '');
206 206
         $xref      = $request->get('xref', '');
207
-        $change_id = (int)$request->get('change_id');
207
+        $change_id = (int) $request->get('change_id');
208 208
 
209 209
         // Reject a change, and subsequent changes to the same record
210 210
         Database::prepare(
Please login to merge, or discard this patch.
app/Http/Controllers/AdminUsersController.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -240,7 +240,7 @@
 block discarded – undo
240 240
             // Link to send email to other users.
241 241
             if ($user_id != $user->getUserId()) {
242 242
                 $datum[4] = '<a href="' . e(route('message', ['to'  => $datum[2],
243
-                                                              'url' => route('admin-users'),
243
+                                                                'url' => route('admin-users'),
244 244
                     ])) . '">' . $datum[4] . '</a>';
245 245
             }
246 246
 
Please login to merge, or discard this patch.
app/Services/CalendarService.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -327,9 +327,9 @@
 block discarded – undo
327 327
 
328 328
             // Now fetch these anniversaries
329 329
             foreach ([
330
-                         'INDI' => $ind_sql . $where . $order_by,
331
-                         'FAM'  => $fam_sql . $where . $order_by,
332
-                     ] as $type => $sql) {
330
+                            'INDI' => $ind_sql . $where . $order_by,
331
+                            'FAM'  => $fam_sql . $where . $order_by,
332
+                        ] as $type => $sql) {
333 333
                 $rows = Database::prepare($sql)->execute($args)->fetchAll();
334 334
                 foreach ($rows as $row) {
335 335
                     if ($type === 'INDI') {
Please login to merge, or discard this patch.
app/Date/JulianDate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
         }
75 75
 
76 76
         if (preg_match('/^(\d+) B\.C\.$/', $year, $match)) {
77
-            return - (int) $match[1];
77
+            return -(int) $match[1];
78 78
         }
79 79
 
80 80
         return (int) $year;
Please login to merge, or discard this patch.
app/Stats.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1016,7 +1016,7 @@  discard block
 block discarded – undo
1016 1016
             I18N::translate('Females') . ' - ' . $per_f . '|' .
1017 1017
             I18N::translate('Males') . ' - ' . $per_m;
1018 1018
         $chart_title = I18N::translate('Males') . ' - ' . $per_m . I18N::$list_separator .
1019
-                   I18N::translate('Females') . ' - ' . $per_f;
1019
+                    I18N::translate('Females') . ' - ' . $per_f;
1020 1020
 
1021 1021
         return "<img src=\"https://chart.googleapis.com/chart?cht=p3&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_female},{$color_male}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" width=\"{$sizes[0]}\" height=\"{$sizes[1]}\" alt=\"" . $chart_title . '" title="' . $chart_title . '" />';
1022 1022
     }
@@ -1132,7 +1132,7 @@  discard block
 block discarded – undo
1132 1132
             I18N::translate('Living') . ' - ' . $per_l . '|' .
1133 1133
             I18N::translate('Dead') . ' - ' . $per_d . '|';
1134 1134
         $chart_title = I18N::translate('Living') . ' - ' . $per_l . I18N::$list_separator .
1135
-                   I18N::translate('Dead') . ' - ' . $per_d;
1135
+                    I18N::translate('Dead') . ' - ' . $per_d;
1136 1136
 
1137 1137
         return "<img src=\"https://chart.googleapis.com/chart?cht=p3&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_living},{$color_dead}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" width=\"{$sizes[0]}\" height=\"{$sizes[1]}\" alt=\"" . $chart_title . '" title="' . $chart_title . '" />';
1138 1138
     }
Please login to merge, or discard this patch.
app/Date.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
         // Ambiguous dates - don't override calendar escape
163 163
         if ($cal == '') {
164 164
             if (preg_match('/^(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)$/', $m)) {
165
-                $cal =  GregorianDate::ESCAPE;
165
+                $cal = GregorianDate::ESCAPE;
166 166
             } else {
167 167
                 if (preg_match('/^[345]\d\d\d$/', $y)) {
168 168
                     // Year 3000-5999
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
     public function addYears(int $years, string $qualifier = ''): Date
461 461
     {
462 462
         $tmp               = clone $this;
463
-        $tmp->date1->year  += $years;
463
+        $tmp->date1->year += $years;
464 464
         $tmp->date1->month = 0;
465 465
         $tmp->date1->day   = 0;
466 466
         $tmp->date1->setJdFromYmd();
Please login to merge, or discard this patch.