Completed
Pull Request — master (#3735)
by
unknown
17:44
created
app/Http/RequestHandlers/PendingChangesLogData.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@
 block discarded – undo
112 112
                 '<div class="gedcom-data" dir="ltr">' .
113 113
                 preg_replace_callback(
114 114
                     '/@(' . Gedcom::REGEX_XREF . ')@/',
115
-                    static function (array $match) use ($tree): string {
115
+                    static function (array $match) use ($tree) : string {
116 116
                         $record = Registry::gedcomRecordFactory()->make($match[1], $tree);
117 117
 
118 118
                         return $record ? '<a href="' . e($record->url()) . '">' . $match[0] . '</a>' : $match[0];
Please login to merge, or discard this patch.
app/Http/RequestHandlers/DataFixUpdateAll.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@
 block discarded – undo
94 94
         /** @var Collection<GedcomRecord> $records */
95 95
         $records = $rows->map(function (stdClass $row) use ($tree): ?GedcomRecord {
96 96
             return $this->data_fix_service->getRecordByType($row->xref, $tree, $row->type);
97
-        })->filter(static function (?GedcomRecord $record) use ($module, $params): bool {
97
+        })->filter(static function (?GedcomRecord $record) use ($module, $params) : bool {
98 98
             return $record instanceof GedcomRecord && !$record->isPendingDeletion() && $module->doesRecordNeedUpdate($record, $params);
99 99
         });
100 100
 
Please login to merge, or discard this patch.
app/Http/RequestHandlers/ManageMediaData.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
                     $create_form = '';
233 233
                     foreach ($media_trees as $media_tree => $media_directory) {
234 234
                         if (str_starts_with($row[0], $media_directory)) {
235
-                            $tmp         = substr($row[0], strlen($media_directory));
235
+                            $tmp = substr($row[0], strlen($media_directory));
236 236
                             $create_form .=
237 237
                                 '<p><a href="#" data-toggle="modal" data-backdrop="static" data-target="#modal-create-media-from-file" data-file="' . e($tmp) . '" data-url="' . e(route(CreateMediaObjectFromFile::class, ['tree' => $media_tree])) . '" onclick="document.getElementById(\'modal-create-media-from-file-form\').action=this.dataset.url; document.getElementById(\'file\').value=this.dataset.file;">' . I18N::translate('Create') . '</a> — ' . e($media_tree) . '<p>';
238 238
                         }
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
                 // This will work for local filesystems.  For remote filesystems, we will
328 328
                 // need to copy the file locally to work out the image size.
329 329
                 $imgsize = getimagesize(Webtrees::DATA_DIR . $file);
330
-                $html    .= '<dt>' . I18N::translate('Image dimensions') . '</dt>';
330
+                $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>';
331 331
                 /* I18N: image dimensions, width × height */
332 332
                 $html .= '<dd>' . I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1'])) . '</dd>';
333 333
             } catch (Throwable $ex) {
Please login to merge, or discard this patch.
app/Http/RequestHandlers/MapDataList.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@
 block discarded – undo
85 85
         }
86 86
 
87 87
         // Request for a non-existent location?
88
-        if ($parent_id !== null &&  $parent->id() === null) {
88
+        if ($parent_id !== null && $parent->id() === null) {
89 89
             return redirect(route(__CLASS__));
90 90
         }
91 91
 
Please login to merge, or discard this patch.
app/Services/UserService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
      */
53 53
     public function find(?int $user_id): ?User
54 54
     {
55
-        return Registry::cache()->array()->remember('user-' . $user_id, static function () use ($user_id): ?User {
55
+        return Registry::cache()->array()->remember('user-' . $user_id, static function () use ($user_id) : ?User {
56 56
             return DB::table('user')
57 57
                 ->where('user_id', '=', $user_id)
58 58
                 ->get()
Please login to merge, or discard this patch.
app/Module/ChartsBlockModule.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
                             'generations' => 3,
118 118
                             'layout'      => PedigreeChartModule::STYLE_RIGHT,
119 119
                         ]);
120
-                        $content   = view('modules/charts/chart', [
120
+                        $content = view('modules/charts/chart', [
121 121
                             'block_id'  => $block_id,
122 122
                             'chart_url' => $chart_url,
123 123
                         ]);
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
                             'generations' => 2,
138 138
                             'chart_style' => DescendancyChartModule::CHART_STYLE_TREE,
139 139
                         ]);
140
-                        $content   = view('modules/charts/chart', [
140
+                        $content = view('modules/charts/chart', [
141 141
                             'block_id'  => $block_id,
142 142
                             'chart_url' => $chart_url,
143 143
                         ]);
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
                     break;
150 150
 
151 151
                 case 'hourglass':
152
-                    $module    = $this->module_service->findByInterface(HourglassChartModule::class)->first();
152
+                    $module = $this->module_service->findByInterface(HourglassChartModule::class)->first();
153 153
 
154 154
                     if ($module instanceof HourglassChartModule) {
155 155
                         $title     = $module->chartTitle($individual);
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
                             'ajax'        => true,
158 158
                             'generations' => 2,
159 159
                         ]);
160
-                        $content   = view('modules/charts/chart', [
160
+                        $content = view('modules/charts/chart', [
161 161
                             'block_id'  => $block_id,
162 162
                             'chart_url' => $chart_url,
163 163
                         ]);
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
         $default_xref     = $gedcomid ?: $PEDIGREE_ROOT_ID;
263 263
 
264 264
         $type = $this->getBlockSetting($block_id, 'type', 'pedigree');
265
-        $xref  = $this->getBlockSetting($block_id, 'pid', $default_xref);
265
+        $xref = $this->getBlockSetting($block_id, 'pid', $default_xref);
266 266
 
267 267
         $charts = [
268 268
             'pedigree'    => I18N::translate('Pedigree'),
Please login to merge, or discard this patch.
app/Elements/NameRomanizedVariation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
  */
36 36
 class NameRomanizedVariation extends AbstractElement
37 37
 {
38
-    protected const SUBTAGS = ['NPFX', 'GIVN', 'SPFX','SURN', 'NSFX', 'NICK', 'TYPE'];
38
+    protected const SUBTAGS = ['NPFX', 'GIVN', 'SPFX', 'SURN', 'NSFX', 'NICK', 'TYPE'];
39 39
 
40 40
     protected const MAXIMUM_LENGTH = 120;
41 41
 
Please login to merge, or discard this patch.
app/Elements/NamePhoneticVariation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
  */
30 30
 class NamePhoneticVariation extends AbstractElement
31 31
 {
32
-    protected const SUBTAGS = ['NPFX', 'GIVN', 'SPFX','SURN', 'NSFX', 'NICK', 'TYPE'];
32
+    protected const SUBTAGS = ['NPFX', 'GIVN', 'SPFX', 'SURN', 'NSFX', 'NICK', 'TYPE'];
33 33
 
34 34
     protected const MAXIMUM_LENGTH = 120;
35 35
 }
Please login to merge, or discard this patch.
app/Module/CensusAssistantModule.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -287,7 +287,7 @@
 block discarded – undo
287 287
         $censusYear  = (int) substr($census->censusDate(), -4);
288 288
         $options     = [];
289 289
         $individuals = new Collection();
290
-        $families    =  $individual->childFamilies()
290
+        $families    = $individual->childFamilies()
291 291
                 ->merge($individual->childStepFamilies())
292 292
                 ->merge($individual->spouseFamilies())
293 293
                 ->merge($individual->spouseStepFamilies());
Please login to merge, or discard this patch.