Completed
Push — develop ( d7b94d...3a0c01 )
by Greg
06:28
created
app/Statistics/Google/ChartDivorce.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
         $chart_color1 = (string) $this->theme->parameter('distribution-chart-no-values');
102 102
         $chart_color2 = (string) $this->theme->parameter('distribution-chart-high-values');
103 103
         $color_from   = $color_from ?? $chart_color1;
104
-        $color_to     = $color_to   ?? $chart_color2;
104
+        $color_to     = $color_to ?? $chart_color2;
105 105
 
106 106
         $data = [
107 107
             [
Please login to merge, or discard this patch.
app/Http/RequestHandlers/ExportGedcomClient.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -159,7 +159,7 @@
 block discarded – undo
159 159
             $stream_factory = app(StreamFactoryInterface::class);
160 160
             assert($stream_factory instanceof StreamFactoryInterface);
161 161
 
162
-            $http_stream   = $stream_factory->createStreamFromFile($temp_zip_file);
162
+            $http_stream = $stream_factory->createStreamFromFile($temp_zip_file);
163 163
             $filename = addcslashes($download_filename, '"') . '.zip';
164 164
 
165 165
             /** @var ResponseFactoryInterface $response_factory */
Please login to merge, or discard this patch.
app/Module/ClippingsCartModule.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -321,7 +321,7 @@
 block discarded – undo
321 321
 
322 322
         // Create a source, to indicate the source of the data.
323 323
         $record = "0 @WEBTREES@ SOUR\n1 TITL " . $base_url;
324
-        $author   = $this->user_service->find((int) $tree->getPreference('CONTACT_USER_ID'));
324
+        $author = $this->user_service->find((int) $tree->getPreference('CONTACT_USER_ID'));
325 325
         if ($author !== null) {
326 326
             $record .= "\n1 AUTH " . $author->realName();
327 327
         }
Please login to merge, or discard this patch.
app/Statistics/Repository/FamilyDatesRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
             ->select(['d_gid as id', 'd_year as year', 'd_fact AS fact', 'd_type AS type'])
80 80
             ->where('d_file', '=', $this->tree->id())
81 81
             ->where('d_fact', '=', $fact)
82
-            ->where('d_julianday1', '=', function (Builder $query) use ($operation, $fact): void {
82
+            ->where('d_julianday1', '=', function (Builder $query) use ($operation, $fact) : void {
83 83
                 $query->selectRaw($operation . '(d_julianday1)')
84 84
                     ->from('dates')
85 85
                     ->where('d_file', '=', $this->tree->id())
Please login to merge, or discard this patch.
app/Services/ModuleService.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -694,7 +694,7 @@  discard block
 block discarded – undo
694 694
         } catch (Throwable $exception) {
695 695
             $module_name = basename(dirname($filename));
696 696
             $message     = 'Fatal error in module: ' . $module_name;
697
-            $message     .= '<br>' . $exception;
697
+            $message .= '<br>' . $exception;
698 698
             FlashMessages::addMessage($message, 'danger');
699 699
         }
700 700
         return null;
@@ -805,7 +805,7 @@  discard block
 block discarded – undo
805 805
     public function findByName(string $module_name, bool $include_disabled = false): ?ModuleInterface
806 806
     {
807 807
         return $this->all($include_disabled)
808
-            ->first(static function (ModuleInterface $module) use ($module_name): bool {
808
+            ->first(static function (ModuleInterface $module) use ($module_name) : bool {
809 809
                 return $module->name() === $module_name;
810 810
             });
811 811
     }
Please login to merge, or discard this patch.
app/Http/RequestHandlers/LinkSpouseToIndividualPage.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
 
58 58
         // Create a dummy family record, so we can create new/empty facts.
59 59
         $dummy = Factory::family()->new('', '0 @@ FAM', null, $tree);
60
-        $facts  = [
60
+        $facts = [
61 61
             'f' => [
62 62
                 new Fact('1 MARR', $dummy, ''),
63 63
             ],
Please login to merge, or discard this patch.
app/Functions/FunctionsPrintFacts.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -583,7 +583,7 @@  discard block
 block discarded – undo
583 583
         for ($j = 0; $j < $ct; $j++) {
584 584
             if (!str_contains($match[$j][1], '@')) {
585 585
                 $source = e($match[$j][1] . preg_replace('/\n\d CONT ?/', "\n", $match[$j][2]));
586
-                $data   .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
586
+                $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
587 587
             }
588 588
         }
589 589
         // Find source for each fact
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
601 601
                     }
602 602
                     $srec     = substr($factrec, $spos1, $spos2 - $spos1);
603 603
                     $lt       = preg_match_all("/$nlevel \w+/", $srec, $matches);
604
-                    $data     .= '<div class="fact_SOUR">';
604
+                    $data .= '<div class="fact_SOUR">';
605 605
                     $id       = 'collapse-' . Uuid::uuid4()->toString();
606 606
                     $expanded = (bool) $tree->getPreference('EXPAND_SOURCES');
607 607
                     if ($lt > 0) {
Please login to merge, or discard this patch.
app/Http/Controllers/Admin/MediaController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
         $data_filesystem = $request->getAttribute('filesystem.data');
153 153
         assert($data_filesystem instanceof FilesystemInterface);
154 154
 
155
-        $files  = $request->getQueryParams()['files']; // local|external|unused
155
+        $files = $request->getQueryParams()['files']; // local|external|unused
156 156
 
157 157
         // Files within this folder
158 158
         $media_folder = $request->getQueryParams()['media_folder'];
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
                     $create_form = '';
267 267
                     foreach ($media_trees as $media_tree => $media_directory) {
268 268
                         if (str_starts_with($row[0], $media_directory)) {
269
-                            $tmp         = substr($row[0], strlen($media_directory));
269
+                            $tmp = substr($row[0], strlen($media_directory));
270 270
                             $create_form .=
271 271
                                 '<p><a href="#" data-toggle="modal" data-target="#modal-create-media-from-file" data-file="' . e($tmp) . '" data-url="' . e(route('create-media-from-file', ['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>';
272 272
                         }
@@ -360,8 +360,8 @@  discard block
 block discarded – undo
360 360
             try {
361 361
                 // This will work for local filesystems.  For remote filesystems, we will
362 362
                 // need to copy the file locally to work out the image size.
363
-                $imgsize = getimagesize(Webtrees::DATA_DIR .  $file);
364
-                $html    .= '<dt>' . I18N::translate('Image dimensions') . '</dt>';
363
+                $imgsize = getimagesize(Webtrees::DATA_DIR . $file);
364
+                $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>';
365 365
                 /* I18N: image dimensions, width × height */
366 366
                 $html .= '<dd>' . I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1'])) . '</dd>';
367 367
             } catch (Throwable $ex) {
Please login to merge, or discard this patch.
app/Module/BranchesListModule.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
 {
65 65
     use ModuleListTrait;
66 66
 
67
-    protected const ROUTE_URL  = '/tree/{tree}/branches{/surname}';
67
+    protected const ROUTE_URL = '/tree/{tree}/branches{/surname}';
68 68
 
69 69
     /** @var ModuleService */
70 70
     protected $module_service;
Please login to merge, or discard this patch.