fix: messages (#4843)

18 files changed, 34 insertions, 34 deletions

diff --git a/app/Report/HtmlRenderer.php b/app/Report/HtmlRenderer.php
index 5b68e1ea9e..12b636697d 100644
--- a/app/Report/HtmlRenderer.php
+++ b/app/Report/HtmlRenderer.php
@@ -392,7 +392,7 @@ class HtmlRenderer extends AbstractRenderer
     }
 
     /**
-     * Uppdate max Y to keep track it incase of a pagebreak - ReportHtml
+     * Uppdate max Y to keep track it in case of a pagebreak - ReportHtml
      *
      * @param float $y
      *
diff --git a/app/Report/PdfRenderer.php b/app/Report/PdfRenderer.php
index 3e493e9319..bbe261242b 100644
--- a/app/Report/PdfRenderer.php
+++ b/app/Report/PdfRenderer.php
@@ -236,7 +236,7 @@ class PdfRenderer extends AbstractRenderer
     }
 
     /**
-     * Get the maximum line width to draw from the curren position -PDF
+     * Get the maximum line width to draw from the current position -PDF
      * RTL supported
      *
      * @return float
diff --git a/app/Report/ReportHtmlFootnote.php b/app/Report/ReportHtmlFootnote.php
index 83ef62ccbc..6238a0782c 100644
--- a/app/Report/ReportHtmlFootnote.php
+++ b/app/Report/ReportHtmlFootnote.php
@@ -78,7 +78,7 @@ class ReportHtmlFootnote extends ReportBaseFootnote
      * Calculates the Footnotes height
      *
      * @param HtmlRenderer $renderer
-     * @param float        $cellWidth The width of the cell to use it for text wraping
+     * @param float        $cellWidth The width of the cell to use it for text wrapping
      *
      * @return float     Footnote height in points
      */
@@ -134,11 +134,11 @@ class ReportHtmlFootnote extends ReportBaseFootnote
                 $newtext            = '';
                 $wrapWidthRemaining = $this->wrapWidthRemaining;
                 $lines              = explode("\n", $this->numText);
-                // Go throught the text line by line
+                // Go through the text line by line
                 foreach ($lines as $line) {
                     // Line width in points + a little margin
                     $lw = $renderer->getStringWidth($line);
-                    // If the line has to be wraped
+                    // If the line has to be wrapped
                     if ($lw > $wrapWidthRemaining) {
                         $words    = explode(' ', $line);
                         $addspace = count($words);
diff --git a/app/Report/ReportHtmlText.php b/app/Report/ReportHtmlText.php
index a09132ef65..3f3824405d 100644
--- a/app/Report/ReportHtmlText.php
+++ b/app/Report/ReportHtmlText.php
@@ -137,11 +137,11 @@ class ReportHtmlText extends ReportBaseText
             if ($lw >= $wrapWidthRemaining || $lfct > 1) {
                 $newtext            = '';
                 $lines              = explode("\n", $this->text);
-                // Go throught the text line by line
+                // Go through the text line by line
                 foreach ($lines as $line) {
                     // Line width in points + a little margin
                     $lw = $renderer->getStringWidth($line);
-                    // If the line has to be wraped
+                    // If the line has to be wrapped
                     if ($lw > $wrapWidthRemaining) {
                         $words    = explode(' ', $line);
                         $addspace = count($words);
diff --git a/app/Report/ReportHtmlTextbox.php b/app/Report/ReportHtmlTextbox.php
index e94354a0be..21c0c6a397 100644
--- a/app/Report/ReportHtmlTextbox.php
+++ b/app/Report/ReportHtmlTextbox.php
@@ -199,7 +199,7 @@ class ReportHtmlTextbox extends ReportBaseTextbox
             if ($eH === 0.0) {
                 // Number of LF but at least one line
                 $cHT = ($cHT + 1) * $renderer->cellHeightRatio;
-                // Calculate the cell hight with the largest font size used
+                // Calculate the cell height with the largest font size used
                 $cHT *= $renderer->largestFontHeight;
                 if ($cH < $cHT) {
                     $cH = $cHT;
@@ -216,7 +216,7 @@ class ReportHtmlTextbox extends ReportBaseTextbox
 
         unset($lw, $cHT, $fH, $w);
 
-        // Finaly, check the last cells height
+        // Finally, check the last cells height
         if ($cH < $renderer->lastCellHeight) {
             $cH = $renderer->lastCellHeight;
         }
diff --git a/app/Report/ReportParserGenerate.php b/app/Report/ReportParserGenerate.php
index 90eefe91a1..8d1c4b6fee 100644
--- a/app/Report/ReportParserGenerate.php
+++ b/app/Report/ReportParserGenerate.php
@@ -100,7 +100,7 @@ class ReportParserGenerate extends ReportParserBase
     /** Are we collecting data from <Footnote> elements */
     private bool $process_footnote = true;
 
-    /** Are we currently outputing data? */
+    /** Are we currently outputting data? */
     private bool $print_data = false;
 
     /** @var array<int,bool> Push-down stack of $print_data */
diff --git a/app/Report/ReportPdfCell.php b/app/Report/ReportPdfCell.php
index 90e6fa0a09..35667a7aca 100644
--- a/app/Report/ReportPdfCell.php
+++ b/app/Report/ReportPdfCell.php
@@ -153,7 +153,7 @@ class ReportPdfCell extends ReportBaseCell
             $renderer->lastCellHeight = $renderer->tcpdf->getLastH();
         }
 
-        // Set up the url link if exists ontop of the cell
+        // Set up the url link if exists on top of the cell
         if (!empty($this->url)) {
             $renderer->tcpdf->Link($cX, $this->top, $this->width, $this->height, $this->url);
         }
diff --git a/app/Report/ReportPdfFootnote.php b/app/Report/ReportPdfFootnote.php
index bc95521231..09c4c97797 100644
--- a/app/Report/ReportPdfFootnote.php
+++ b/app/Report/ReportPdfFootnote.php
@@ -124,11 +124,11 @@ class ReportPdfFootnote extends ReportBaseFootnote
             if ($lw >= $wrapWidthRemaining || $lfct > 1) {
                 $newtext = '';
                 $lines   = explode("\n", $this->numText);
-                // Go throught the text line by line
+                // Go through the text line by line
                 foreach ($lines as $line) {
                     // Line width in points
                     $lw = ceil($renderer->tcpdf->GetStringWidth($line));
-                    // If the line has to be wraped
+                    // If the line has to be wrapped
                     if ($lw >= $wrapWidthRemaining) {
                         $words    = explode(' ', $line);
                         $addspace = count($words);
diff --git a/app/Report/ReportPdfText.php b/app/Report/ReportPdfText.php
index afe0102961..1aa28c7c51 100644
--- a/app/Report/ReportPdfText.php
+++ b/app/Report/ReportPdfText.php
@@ -136,11 +136,11 @@ class ReportPdfText extends ReportBaseText
             if ($lw >= $wrapWidthRemaining || $lfct > 1) {
                 $newtext = '';
                 $lines   = explode("\n", $this->text);
-                // Go throught the text line by line
+                // Go through the text line by line
                 foreach ($lines as $line) {
                     // Line width in points + a little margin
                     $lw = $renderer->tcpdf->GetStringWidth($line);
-                    // If the line has to be wraped
+                    // If the line has to be wrapped
                     if ($lw > $wrapWidthRemaining) {
                         $words    = explode(' ', $line);
                         $addspace = count($words);
diff --git a/app/Report/ReportPdfTextBox.php b/app/Report/ReportPdfTextBox.php
index 4e05ca00a9..4813094078 100644
--- a/app/Report/ReportPdfTextBox.php
+++ b/app/Report/ReportPdfTextBox.php
@@ -200,7 +200,7 @@ class ReportPdfTextBox extends ReportBaseTextbox
             if ($eH === 0.0) {
                 // This is text elements. Number of LF but at least one line
                 $cHT = ($cHT + 1) * $renderer->tcpdf->getCellHeightRatio();
-                // Calculate the cell hight with the largest font size used within this Box
+                // Calculate the cell height with the largest font size used within this Box
                 $cHT *= $renderer->largestFontHeight;
                 // Add cell padding
                 if ($this->padding) {
@@ -218,7 +218,7 @@ class ReportPdfTextBox extends ReportBaseTextbox
                 $cH = $eH;
             }
         }
-        // Finaly, check the last cells height
+        // Finally, check the last cells height
         if ($cH < $renderer->lastCellHeight) {
             $cH = $renderer->lastCellHeight;
         }
diff --git a/app/Statistics/Repository/EventRepository.php b/app/Statistics/Repository/EventRepository.php
index ac77cc4e5a..77af51d081 100644
--- a/app/Statistics/Repository/EventRepository.php
+++ b/app/Statistics/Repository/EventRepository.php
@@ -183,7 +183,7 @@ class EventRepository implements EventRepositoryInterface
     }
 
     /**
-     * Retursn the list of common facts used query the data.
+     * Returns the list of common facts used query the data.
      *
      * @return array<string>
      */
@@ -242,7 +242,7 @@ class EventRepository implements EventRepositoryInterface
     }
 
     /**
-     * Returns the formatted first/last occuring event.
+     * Returns the formatted first/last occurring event.
      *
      * @param string $direction The sorting direction
      *
@@ -283,7 +283,7 @@ class EventRepository implements EventRepositoryInterface
     }
 
     /**
-     * Returns the formatted year of the first/last occuring event.
+     * Returns the formatted year of the first/last occurring event.
      *
      * @param string $direction The sorting direction
      *
@@ -364,7 +364,7 @@ class EventRepository implements EventRepositoryInterface
     }
 
     /**
-     * Returns the formatted name of the first/last occuring event.
+     * Returns the formatted name of the first/last occurring event.
      *
      * @param string $direction The sorting direction
      *
@@ -402,7 +402,7 @@ class EventRepository implements EventRepositoryInterface
     }
 
     /**
-     * Returns the formatted place of the first/last occuring event.
+     * Returns the formatted place of the first/last occurring event.
      *
      * @param string $direction The sorting direction
      *
diff --git a/app/Statistics/Repository/FamilyDatesRepository.php b/app/Statistics/Repository/FamilyDatesRepository.php
index c4691652a4..7ed489f2bc 100644
--- a/app/Statistics/Repository/FamilyDatesRepository.php
+++ b/app/Statistics/Repository/FamilyDatesRepository.php
@@ -94,7 +94,7 @@ class FamilyDatesRepository implements FamilyDatesRepositoryInterface
     }
 
     /**
-     * Returns the formatted year of the first/last occuring event.
+     * Returns the formatted year of the first/last occurring event.
      *
      * @param string $type      The fact to query
      * @param string $operation The sorting operation
@@ -184,7 +184,7 @@ class FamilyDatesRepository implements FamilyDatesRepositoryInterface
     }
 
     /**
-     * Returns the formatted year of the first/last occuring event.
+     * Returns the formatted year of the first/last occurring event.
      *
      * @param string $type      The fact to query
      * @param string $operation The sorting operation
@@ -272,7 +272,7 @@ class FamilyDatesRepository implements FamilyDatesRepositoryInterface
     }
 
     /**
-     * Returns the formatted name of the first/last occuring event.
+     * Returns the formatted name of the first/last occurring event.
      *
      * @param string $type      The fact to query
      * @param string $operation The sorting operation
@@ -359,7 +359,7 @@ class FamilyDatesRepository implements FamilyDatesRepositoryInterface
     }
 
     /**
-     * Returns the formatted place of the first/last occuring event.
+     * Returns the formatted place of the first/last occurring event.
      *
      * @param string $type      The fact to query
      * @param string $operation The sorting operation
diff --git a/app/Statistics/Repository/FamilyRepository.php b/app/Statistics/Repository/FamilyRepository.php
index d9426108c0..70f505ecb6 100644
--- a/app/Statistics/Repository/FamilyRepository.php
+++ b/app/Statistics/Repository/FamilyRepository.php
@@ -553,7 +553,7 @@ class FamilyRepository
     }
 
     /**
-     * General query on familes/children.
+     * General query on families/children.
      *
      * @param int    $year1
      * @param int    $year2
diff --git a/app/Statistics/Repository/IndividualRepository.php b/app/Statistics/Repository/IndividualRepository.php
index 3d2ae47e45..8cb99a4cd5 100644
--- a/app/Statistics/Repository/IndividualRepository.php
+++ b/app/Statistics/Repository/IndividualRepository.php
@@ -441,7 +441,7 @@ class IndividualRepository implements IndividualRepositoryInterface
     }
 
     /**
-     * Count the number of distinct given names (or the number of occurences of specific given names).
+     * Count the number of distinct given names (or the number of occurrences of specific given names).
      *
      * @param array<string> ...$params
      *
@@ -459,7 +459,7 @@ class IndividualRepository implements IndividualRepositoryInterface
                 ->where('n_givn', '<>', Individual::PRAENOMEN_NESCIO)
                 ->whereNotNull('n_givn');
         } else {
-            // Count number of occurences of specific given names.
+            // Count number of occurrences of specific given names.
             $query->whereIn('n_givn', $params);
         }
 
@@ -485,7 +485,7 @@ class IndividualRepository implements IndividualRepositoryInterface
             $query->distinct()
                 ->whereNotNull('n_surn');
         } else {
-            // Count number of occurences of specific surnames.
+            // Count number of occurrences of specific surnames.
             $query->whereIn('n_surn', $params);
         }
 
diff --git a/tests/app/Census/CensusColumnSexFTest.php b/tests/app/Census/CensusColumnSexFTest.php
index dd0861d2a3..4e86c9ff8a 100644
--- a/tests/app/Census/CensusColumnSexFTest.php
+++ b/tests/app/Census/CensusColumnSexFTest.php
@@ -25,7 +25,7 @@ use Fisharebest\Webtrees\TestCase;
 /**
  * Test harness for the class CensusColumnSexF
  *
- * X is the value expected for Female, as only the M or F colum is expected
+ * X is the value expected for Female, as only the M or F column is expected
  * to be marked.
  */
 class CensusColumnSexFTest extends TestCase
diff --git a/tests/app/Census/CensusColumnSexMTest.php b/tests/app/Census/CensusColumnSexMTest.php
index f00e151358..33a22ebde6 100644
--- a/tests/app/Census/CensusColumnSexMTest.php
+++ b/tests/app/Census/CensusColumnSexMTest.php
@@ -25,7 +25,7 @@ use Fisharebest\Webtrees\TestCase;
 /**
  * Test harness for the class CensusColumnSexM
  *
- * X is the value expected for Male, as only the M or F colum is expected
+ * X is the value expected for Male, as only the M or F column is expected
  * to be marked.
  */
 class CensusColumnSexMTest extends TestCase
diff --git a/tests/app/Census/CensusOfUnitedStates1890Test.php b/tests/app/Census/CensusOfUnitedStates1890Test.php
index 74b6757829..174adcd339 100644
--- a/tests/app/Census/CensusOfUnitedStates1890Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1890Test.php
@@ -113,7 +113,7 @@ class CensusOfUnitedStates1890Test extends TestCase
         self::assertSame('Sex', $columns[5]->title());
         self::assertSame('Age at nearest birthday. If under one year, give age in months', $columns[6]->title());
         self::assertSame('Whether single, married, widowed, or divorced', $columns[7]->title());
-        self::assertSame('Whether married duirng the census year (June 1, 1889, to May 31, 1890)', $columns[8]->title());
+        self::assertSame('Whether married during the census year (June 1, 1889, to May 31, 1890)', $columns[8]->title());
         self::assertSame('Mother of how many children, and number of these children living', $columns[9]->title());
         self::assertSame('Place of birth', $columns[10]->title());
         self::assertSame('Place of birth of father', $columns[11]->title());
diff --git a/tests/app/Services/GedcomEditServiceTest.php b/tests/app/Services/GedcomEditServiceTest.php
index b65dbf7c32..df4071eb37 100644
--- a/tests/app/Services/GedcomEditServiceTest.php
+++ b/tests/app/Services/GedcomEditServiceTest.php
@@ -174,7 +174,7 @@ class GedcomEditServiceTest extends TestCase
     }
 
     /**
-     * Data provider for new inidvidual facts tests
+     * Data provider for new individual facts tests
      * @return array<array<string|array<string>>>
      */
     public static function newIndividualFactsData(): array