diff options
249 files changed, 675 insertions, 688 deletions
diff --git a/app/Census/Census.php b/app/Census/Census.php index e8e5a7ce4d..f947c917d8 100644 --- a/app/Census/Census.php +++ b/app/Census/Census.php @@ -27,7 +27,7 @@ class Census /** * @param string $locale * - * @return CensusPlaceInterface[] + * @return array<CensusPlaceInterface> */ public static function censusPlaces(string $locale): array { diff --git a/app/Census/CensusInterface.php b/app/Census/CensusInterface.php index 9640f9f180..ea5c296a74 100644 --- a/app/Census/CensusInterface.php +++ b/app/Census/CensusInterface.php @@ -34,7 +34,7 @@ interface CensusInterface extends CensusPlaceInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array; } diff --git a/app/Census/CensusOfCanada.php b/app/Census/CensusOfCanada.php index 0288712351..ca1464bb80 100644 --- a/app/Census/CensusOfCanada.php +++ b/app/Census/CensusOfCanada.php @@ -27,7 +27,7 @@ class CensusOfCanada extends Census implements CensusPlaceInterface /** * All available censuses for this census place. * - * @return CensusInterface[] + * @return array<CensusInterface> */ public function allCensusDates(): array { diff --git a/app/Census/CensusOfCanada1851.php b/app/Census/CensusOfCanada1851.php index 6cbf46922d..ab5f91706c 100644 --- a/app/Census/CensusOfCanada1851.php +++ b/app/Census/CensusOfCanada1851.php @@ -40,7 +40,7 @@ class CensusOfCanada1851 extends CensusOfCanada implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfCanada1861.php b/app/Census/CensusOfCanada1861.php index 8d3424dd67..5e99924713 100644 --- a/app/Census/CensusOfCanada1861.php +++ b/app/Census/CensusOfCanada1861.php @@ -37,7 +37,7 @@ class CensusOfCanada1861 extends CensusOfCanada implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfCanada1871.php b/app/Census/CensusOfCanada1871.php index bae04107b7..2a28a2a21b 100644 --- a/app/Census/CensusOfCanada1871.php +++ b/app/Census/CensusOfCanada1871.php @@ -37,7 +37,7 @@ class CensusOfCanada1871 extends CensusOfCanada implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfCanada1881.php b/app/Census/CensusOfCanada1881.php index de20ddb42f..f2b7a7a47e 100644 --- a/app/Census/CensusOfCanada1881.php +++ b/app/Census/CensusOfCanada1881.php @@ -37,7 +37,7 @@ class CensusOfCanada1881 extends CensusOfCanada implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfCanada1891.php b/app/Census/CensusOfCanada1891.php index da12d337a4..0078637316 100644 --- a/app/Census/CensusOfCanada1891.php +++ b/app/Census/CensusOfCanada1891.php @@ -37,7 +37,7 @@ class CensusOfCanada1891 extends CensusOfCanada implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfCanada1901.php b/app/Census/CensusOfCanada1901.php index 963dc5b7a8..3dd7a776b0 100644 --- a/app/Census/CensusOfCanada1901.php +++ b/app/Census/CensusOfCanada1901.php @@ -37,7 +37,7 @@ class CensusOfCanada1901 extends CensusOfCanada implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfCanada1911.php b/app/Census/CensusOfCanada1911.php index 922e1230d5..2df1e2e3b7 100644 --- a/app/Census/CensusOfCanada1911.php +++ b/app/Census/CensusOfCanada1911.php @@ -37,7 +37,7 @@ class CensusOfCanada1911 extends CensusOfCanada implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfCanada1921.php b/app/Census/CensusOfCanada1921.php index 6d14b33bbc..6c2e6fbc7b 100644 --- a/app/Census/CensusOfCanada1921.php +++ b/app/Census/CensusOfCanada1921.php @@ -37,7 +37,7 @@ class CensusOfCanada1921 extends CensusOfCanada implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfCanadaPraries1916.php b/app/Census/CensusOfCanadaPraries1916.php index 795182f794..83107306b8 100644 --- a/app/Census/CensusOfCanadaPraries1916.php +++ b/app/Census/CensusOfCanadaPraries1916.php @@ -37,7 +37,7 @@ class CensusOfCanadaPraries1916 extends CensusOfCanada implements CensusInterfac /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfCanadaPraries1926.php b/app/Census/CensusOfCanadaPraries1926.php index 048e4dd017..2ea5f9fdab 100644 --- a/app/Census/CensusOfCanadaPraries1926.php +++ b/app/Census/CensusOfCanadaPraries1926.php @@ -37,7 +37,7 @@ class CensusOfCanadaPraries1926 extends CensusOfCanada implements CensusInterfac /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfCzechRepublic.php b/app/Census/CensusOfCzechRepublic.php index 2cf49b7d93..0487bc7928 100644 --- a/app/Census/CensusOfCzechRepublic.php +++ b/app/Census/CensusOfCzechRepublic.php @@ -27,7 +27,7 @@ class CensusOfCzechRepublic extends Census implements CensusPlaceInterface /** * All available censuses for this census place. * - * @return CensusInterface[] + * @return array<CensusInterface> */ public function allCensusDates(): array { diff --git a/app/Census/CensusOfCzechRepublic1880.php b/app/Census/CensusOfCzechRepublic1880.php index 76a65f825e..f5ef19dbdc 100644 --- a/app/Census/CensusOfCzechRepublic1880.php +++ b/app/Census/CensusOfCzechRepublic1880.php @@ -37,7 +37,7 @@ class CensusOfCzechRepublic1880 extends CensusOfCzechRepublic implements CensusI /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfCzechRepublic1890.php b/app/Census/CensusOfCzechRepublic1890.php index 97d470d053..f3e9d48a62 100644 --- a/app/Census/CensusOfCzechRepublic1890.php +++ b/app/Census/CensusOfCzechRepublic1890.php @@ -37,7 +37,7 @@ class CensusOfCzechRepublic1890 extends CensusOfCzechRepublic implements CensusI /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfCzechRepublic1900.php b/app/Census/CensusOfCzechRepublic1900.php index 3258752416..d8ae654961 100644 --- a/app/Census/CensusOfCzechRepublic1900.php +++ b/app/Census/CensusOfCzechRepublic1900.php @@ -37,7 +37,7 @@ class CensusOfCzechRepublic1900 extends CensusOfCzechRepublic implements CensusI /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfCzechRepublic1910.php b/app/Census/CensusOfCzechRepublic1910.php index 7672e45ea0..574fe9d350 100644 --- a/app/Census/CensusOfCzechRepublic1910.php +++ b/app/Census/CensusOfCzechRepublic1910.php @@ -37,7 +37,7 @@ class CensusOfCzechRepublic1910 extends CensusOfCzechRepublic implements CensusI /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfCzechRepublic1921.php b/app/Census/CensusOfCzechRepublic1921.php index 48625dd343..c74a8873e3 100644 --- a/app/Census/CensusOfCzechRepublic1921.php +++ b/app/Census/CensusOfCzechRepublic1921.php @@ -37,7 +37,7 @@ class CensusOfCzechRepublic1921 extends CensusOfCzechRepublic implements CensusI /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark.php b/app/Census/CensusOfDenmark.php index 9553a71acb..4e6eb38011 100644 --- a/app/Census/CensusOfDenmark.php +++ b/app/Census/CensusOfDenmark.php @@ -27,7 +27,7 @@ class CensusOfDenmark extends Census implements CensusPlaceInterface /** * All available censuses for this census place. * - * @return CensusInterface[] + * @return array<CensusInterface> */ public function allCensusDates(): array { diff --git a/app/Census/CensusOfDenmark1787.php b/app/Census/CensusOfDenmark1787.php index f955dc170d..6a810ed285 100644 --- a/app/Census/CensusOfDenmark1787.php +++ b/app/Census/CensusOfDenmark1787.php @@ -37,7 +37,7 @@ class CensusOfDenmark1787 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1801.php b/app/Census/CensusOfDenmark1801.php index c5860f0d1b..8319e9daa3 100644 --- a/app/Census/CensusOfDenmark1801.php +++ b/app/Census/CensusOfDenmark1801.php @@ -37,7 +37,7 @@ class CensusOfDenmark1801 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1803.php b/app/Census/CensusOfDenmark1803.php index 29673f82f8..593048dcc3 100644 --- a/app/Census/CensusOfDenmark1803.php +++ b/app/Census/CensusOfDenmark1803.php @@ -47,7 +47,7 @@ class CensusOfDenmark1803 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1834.php b/app/Census/CensusOfDenmark1834.php index d3ed3f603d..6ceeebd2d0 100644 --- a/app/Census/CensusOfDenmark1834.php +++ b/app/Census/CensusOfDenmark1834.php @@ -37,7 +37,7 @@ class CensusOfDenmark1834 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1835.php b/app/Census/CensusOfDenmark1835.php index 6aeea941d1..af7a650858 100644 --- a/app/Census/CensusOfDenmark1835.php +++ b/app/Census/CensusOfDenmark1835.php @@ -47,7 +47,7 @@ class CensusOfDenmark1835 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1840.php b/app/Census/CensusOfDenmark1840.php index 7ff0fa0117..b632f21b6e 100644 --- a/app/Census/CensusOfDenmark1840.php +++ b/app/Census/CensusOfDenmark1840.php @@ -37,7 +37,7 @@ class CensusOfDenmark1840 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1845.php b/app/Census/CensusOfDenmark1845.php index 6b1b4c522a..7d16d53853 100644 --- a/app/Census/CensusOfDenmark1845.php +++ b/app/Census/CensusOfDenmark1845.php @@ -37,7 +37,7 @@ class CensusOfDenmark1845 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1850.php b/app/Census/CensusOfDenmark1850.php index dc9f2039f1..3897c2c619 100644 --- a/app/Census/CensusOfDenmark1850.php +++ b/app/Census/CensusOfDenmark1850.php @@ -37,7 +37,7 @@ class CensusOfDenmark1850 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1855.php b/app/Census/CensusOfDenmark1855.php index 41be8f2fbf..61297472a1 100644 --- a/app/Census/CensusOfDenmark1855.php +++ b/app/Census/CensusOfDenmark1855.php @@ -37,7 +37,7 @@ class CensusOfDenmark1855 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1860.php b/app/Census/CensusOfDenmark1860.php index e72211cb45..7748a05879 100644 --- a/app/Census/CensusOfDenmark1860.php +++ b/app/Census/CensusOfDenmark1860.php @@ -37,7 +37,7 @@ class CensusOfDenmark1860 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1870.php b/app/Census/CensusOfDenmark1870.php index 54ae146229..ba73efa076 100644 --- a/app/Census/CensusOfDenmark1870.php +++ b/app/Census/CensusOfDenmark1870.php @@ -37,7 +37,7 @@ class CensusOfDenmark1870 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1880.php b/app/Census/CensusOfDenmark1880.php index 4819689ef2..c66b02ebd4 100644 --- a/app/Census/CensusOfDenmark1880.php +++ b/app/Census/CensusOfDenmark1880.php @@ -37,7 +37,7 @@ class CensusOfDenmark1880 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1885.php b/app/Census/CensusOfDenmark1885.php index 91fccc3001..b33883426b 100644 --- a/app/Census/CensusOfDenmark1885.php +++ b/app/Census/CensusOfDenmark1885.php @@ -47,7 +47,7 @@ class CensusOfDenmark1885 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1890.php b/app/Census/CensusOfDenmark1890.php index 3706a9eaa9..6bfeafdd1a 100644 --- a/app/Census/CensusOfDenmark1890.php +++ b/app/Census/CensusOfDenmark1890.php @@ -37,7 +37,7 @@ class CensusOfDenmark1890 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1901.php b/app/Census/CensusOfDenmark1901.php index 93fd5ee07e..c03538758d 100644 --- a/app/Census/CensusOfDenmark1901.php +++ b/app/Census/CensusOfDenmark1901.php @@ -37,7 +37,7 @@ class CensusOfDenmark1901 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1906.php b/app/Census/CensusOfDenmark1906.php index 539e6ca7c9..191e04c983 100644 --- a/app/Census/CensusOfDenmark1906.php +++ b/app/Census/CensusOfDenmark1906.php @@ -37,7 +37,7 @@ class CensusOfDenmark1906 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1911.php b/app/Census/CensusOfDenmark1911.php index 5ee78c1668..43b874b453 100644 --- a/app/Census/CensusOfDenmark1911.php +++ b/app/Census/CensusOfDenmark1911.php @@ -37,7 +37,7 @@ class CensusOfDenmark1911 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1916.php b/app/Census/CensusOfDenmark1916.php index 5b16666672..abd4c54ec3 100644 --- a/app/Census/CensusOfDenmark1916.php +++ b/app/Census/CensusOfDenmark1916.php @@ -37,7 +37,7 @@ class CensusOfDenmark1916 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1921.php b/app/Census/CensusOfDenmark1921.php index 1600195f89..918fa73ba8 100644 --- a/app/Census/CensusOfDenmark1921.php +++ b/app/Census/CensusOfDenmark1921.php @@ -37,7 +37,7 @@ class CensusOfDenmark1921 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1925.php b/app/Census/CensusOfDenmark1925.php index 86d9d7a0eb..b0db04354a 100644 --- a/app/Census/CensusOfDenmark1925.php +++ b/app/Census/CensusOfDenmark1925.php @@ -37,7 +37,7 @@ class CensusOfDenmark1925 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1930.php b/app/Census/CensusOfDenmark1930.php index de677f96c9..81e1bd1b29 100644 --- a/app/Census/CensusOfDenmark1930.php +++ b/app/Census/CensusOfDenmark1930.php @@ -37,7 +37,7 @@ class CensusOfDenmark1930 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDenmark1940.php b/app/Census/CensusOfDenmark1940.php index bb8888bb18..8a1dffe039 100644 --- a/app/Census/CensusOfDenmark1940.php +++ b/app/Census/CensusOfDenmark1940.php @@ -37,7 +37,7 @@ class CensusOfDenmark1940 extends CensusOfDenmark implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDeutschland.php b/app/Census/CensusOfDeutschland.php index f65d452f2c..b600a9516a 100644 --- a/app/Census/CensusOfDeutschland.php +++ b/app/Census/CensusOfDeutschland.php @@ -27,7 +27,7 @@ class CensusOfDeutschland extends Census implements CensusPlaceInterface /** * All available censuses for this census place. * - * @return CensusInterface[] + * @return array<CensusInterface> */ public function allCensusDates(): array { diff --git a/app/Census/CensusOfDeutschland1819.php b/app/Census/CensusOfDeutschland1819.php index 2df1a9c2dd..d6026e292d 100644 --- a/app/Census/CensusOfDeutschland1819.php +++ b/app/Census/CensusOfDeutschland1819.php @@ -47,7 +47,7 @@ class CensusOfDeutschland1819 extends CensusOfDeutschland implements CensusInter /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDeutschland1867.php b/app/Census/CensusOfDeutschland1867.php index 58f8c9a966..8b1541517d 100644 --- a/app/Census/CensusOfDeutschland1867.php +++ b/app/Census/CensusOfDeutschland1867.php @@ -47,7 +47,7 @@ class CensusOfDeutschland1867 extends CensusOfDeutschland implements CensusInter /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDeutschland1900.php b/app/Census/CensusOfDeutschland1900.php index f219d4e7c0..390cfd8e05 100644 --- a/app/Census/CensusOfDeutschland1900.php +++ b/app/Census/CensusOfDeutschland1900.php @@ -47,7 +47,7 @@ class CensusOfDeutschland1900 extends CensusOfDeutschland implements CensusInter /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDeutschland1919.php b/app/Census/CensusOfDeutschland1919.php index 24a2c3eba0..1bb27702d7 100644 --- a/app/Census/CensusOfDeutschland1919.php +++ b/app/Census/CensusOfDeutschland1919.php @@ -47,7 +47,7 @@ class CensusOfDeutschland1919 extends CensusOfDeutschland implements CensusInter /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfDeutschlandNL1867.php b/app/Census/CensusOfDeutschlandNL1867.php index f00fe2bbe9..ce85b74860 100644 --- a/app/Census/CensusOfDeutschlandNL1867.php +++ b/app/Census/CensusOfDeutschlandNL1867.php @@ -47,7 +47,7 @@ class CensusOfDeutschlandNL1867 extends CensusOfDeutschland implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfEngland.php b/app/Census/CensusOfEngland.php index af216eeec6..ac54ccfb31 100644 --- a/app/Census/CensusOfEngland.php +++ b/app/Census/CensusOfEngland.php @@ -27,7 +27,7 @@ class CensusOfEngland extends Census implements CensusPlaceInterface /** * All available censuses for this census place. * - * @return CensusInterface[] + * @return array<CensusInterface> */ public function allCensusDates(): array { diff --git a/app/Census/CensusOfEngland1841.php b/app/Census/CensusOfEngland1841.php index bad37a8228..3a3a4578de 100644 --- a/app/Census/CensusOfEngland1841.php +++ b/app/Census/CensusOfEngland1841.php @@ -37,7 +37,7 @@ class CensusOfEngland1841 extends CensusOfEngland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfEngland1851.php b/app/Census/CensusOfEngland1851.php index 98087a9464..96398bdd62 100644 --- a/app/Census/CensusOfEngland1851.php +++ b/app/Census/CensusOfEngland1851.php @@ -37,7 +37,7 @@ class CensusOfEngland1851 extends CensusOfEngland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfEngland1861.php b/app/Census/CensusOfEngland1861.php index 38ded916d8..b7307b40c3 100644 --- a/app/Census/CensusOfEngland1861.php +++ b/app/Census/CensusOfEngland1861.php @@ -37,7 +37,7 @@ class CensusOfEngland1861 extends CensusOfEngland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfEngland1871.php b/app/Census/CensusOfEngland1871.php index 9a7a3ff33b..94ffaf2fc6 100644 --- a/app/Census/CensusOfEngland1871.php +++ b/app/Census/CensusOfEngland1871.php @@ -37,7 +37,7 @@ class CensusOfEngland1871 extends CensusOfEngland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfEngland1881.php b/app/Census/CensusOfEngland1881.php index d50c845aa2..9eda99289d 100644 --- a/app/Census/CensusOfEngland1881.php +++ b/app/Census/CensusOfEngland1881.php @@ -37,7 +37,7 @@ class CensusOfEngland1881 extends CensusOfEngland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfEngland1891.php b/app/Census/CensusOfEngland1891.php index 7fb365bb8d..b33ef12caa 100644 --- a/app/Census/CensusOfEngland1891.php +++ b/app/Census/CensusOfEngland1891.php @@ -37,7 +37,7 @@ class CensusOfEngland1891 extends CensusOfEngland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfEngland1901.php b/app/Census/CensusOfEngland1901.php index a445d12d40..4d35be04e7 100644 --- a/app/Census/CensusOfEngland1901.php +++ b/app/Census/CensusOfEngland1901.php @@ -37,7 +37,7 @@ class CensusOfEngland1901 extends CensusOfEngland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfEngland1911.php b/app/Census/CensusOfEngland1911.php index db10e0196d..a63fc2c177 100644 --- a/app/Census/CensusOfEngland1911.php +++ b/app/Census/CensusOfEngland1911.php @@ -37,7 +37,7 @@ class CensusOfEngland1911 extends CensusOfEngland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance.php b/app/Census/CensusOfFrance.php index 80b0eabec0..11ea2cbe04 100644 --- a/app/Census/CensusOfFrance.php +++ b/app/Census/CensusOfFrance.php @@ -27,7 +27,7 @@ class CensusOfFrance extends Census implements CensusPlaceInterface /** * All available censuses for this census place. * - * @return CensusInterface[] + * @return array<CensusInterface> */ public function allCensusDates(): array { diff --git a/app/Census/CensusOfFrance1831.php b/app/Census/CensusOfFrance1831.php index da1f3f78a6..81525097d1 100644 --- a/app/Census/CensusOfFrance1831.php +++ b/app/Census/CensusOfFrance1831.php @@ -37,7 +37,7 @@ class CensusOfFrance1831 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1836.php b/app/Census/CensusOfFrance1836.php index a30337a404..35b33f963e 100644 --- a/app/Census/CensusOfFrance1836.php +++ b/app/Census/CensusOfFrance1836.php @@ -37,7 +37,7 @@ class CensusOfFrance1836 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1841.php b/app/Census/CensusOfFrance1841.php index 89d5249f58..9d900ee8b8 100644 --- a/app/Census/CensusOfFrance1841.php +++ b/app/Census/CensusOfFrance1841.php @@ -37,7 +37,7 @@ class CensusOfFrance1841 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1846.php b/app/Census/CensusOfFrance1846.php index 12659cca73..daf263d4f6 100644 --- a/app/Census/CensusOfFrance1846.php +++ b/app/Census/CensusOfFrance1846.php @@ -37,7 +37,7 @@ class CensusOfFrance1846 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1851.php b/app/Census/CensusOfFrance1851.php index 432ea601b8..ab3e1769c2 100644 --- a/app/Census/CensusOfFrance1851.php +++ b/app/Census/CensusOfFrance1851.php @@ -37,7 +37,7 @@ class CensusOfFrance1851 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1856.php b/app/Census/CensusOfFrance1856.php index a136eedd82..a17e68b8c3 100644 --- a/app/Census/CensusOfFrance1856.php +++ b/app/Census/CensusOfFrance1856.php @@ -37,7 +37,7 @@ class CensusOfFrance1856 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1861.php b/app/Census/CensusOfFrance1861.php index 42c5f985b4..cc272da3ef 100644 --- a/app/Census/CensusOfFrance1861.php +++ b/app/Census/CensusOfFrance1861.php @@ -37,7 +37,7 @@ class CensusOfFrance1861 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1866.php b/app/Census/CensusOfFrance1866.php index d5f16ce9f7..7a0d6abc4f 100644 --- a/app/Census/CensusOfFrance1866.php +++ b/app/Census/CensusOfFrance1866.php @@ -37,7 +37,7 @@ class CensusOfFrance1866 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1872.php b/app/Census/CensusOfFrance1872.php index cc4df0de61..999f9a19da 100644 --- a/app/Census/CensusOfFrance1872.php +++ b/app/Census/CensusOfFrance1872.php @@ -37,7 +37,7 @@ class CensusOfFrance1872 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1876.php b/app/Census/CensusOfFrance1876.php index 0c270d446e..a472fd708d 100644 --- a/app/Census/CensusOfFrance1876.php +++ b/app/Census/CensusOfFrance1876.php @@ -37,7 +37,7 @@ class CensusOfFrance1876 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1881.php b/app/Census/CensusOfFrance1881.php index 142f78b501..4b5ee3593b 100644 --- a/app/Census/CensusOfFrance1881.php +++ b/app/Census/CensusOfFrance1881.php @@ -37,7 +37,7 @@ class CensusOfFrance1881 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1886.php b/app/Census/CensusOfFrance1886.php index d01c204e72..760adb2616 100644 --- a/app/Census/CensusOfFrance1886.php +++ b/app/Census/CensusOfFrance1886.php @@ -37,7 +37,7 @@ class CensusOfFrance1886 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1891.php b/app/Census/CensusOfFrance1891.php index 6b16c2a567..f570645c54 100644 --- a/app/Census/CensusOfFrance1891.php +++ b/app/Census/CensusOfFrance1891.php @@ -37,7 +37,7 @@ class CensusOfFrance1891 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1896.php b/app/Census/CensusOfFrance1896.php index c52a6bcec8..98ffc88e74 100644 --- a/app/Census/CensusOfFrance1896.php +++ b/app/Census/CensusOfFrance1896.php @@ -37,7 +37,7 @@ class CensusOfFrance1896 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1901.php b/app/Census/CensusOfFrance1901.php index e5c6ac5b6c..19f9e2e2f9 100644 --- a/app/Census/CensusOfFrance1901.php +++ b/app/Census/CensusOfFrance1901.php @@ -37,7 +37,7 @@ class CensusOfFrance1901 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1906.php b/app/Census/CensusOfFrance1906.php index ebf41294fa..5a83955b4a 100644 --- a/app/Census/CensusOfFrance1906.php +++ b/app/Census/CensusOfFrance1906.php @@ -37,7 +37,7 @@ class CensusOfFrance1906 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1911.php b/app/Census/CensusOfFrance1911.php index b8e1beda85..148c9755b7 100644 --- a/app/Census/CensusOfFrance1911.php +++ b/app/Census/CensusOfFrance1911.php @@ -37,7 +37,7 @@ class CensusOfFrance1911 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1921.php b/app/Census/CensusOfFrance1921.php index 2bfdc0280b..3174ca31aa 100644 --- a/app/Census/CensusOfFrance1921.php +++ b/app/Census/CensusOfFrance1921.php @@ -37,7 +37,7 @@ class CensusOfFrance1921 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1926.php b/app/Census/CensusOfFrance1926.php index a7623428c0..0a55cb3d9c 100644 --- a/app/Census/CensusOfFrance1926.php +++ b/app/Census/CensusOfFrance1926.php @@ -37,7 +37,7 @@ class CensusOfFrance1926 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1931.php b/app/Census/CensusOfFrance1931.php index c9ff699be0..d4209d8df1 100644 --- a/app/Census/CensusOfFrance1931.php +++ b/app/Census/CensusOfFrance1931.php @@ -37,7 +37,7 @@ class CensusOfFrance1931 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1936.php b/app/Census/CensusOfFrance1936.php index c874233905..515f7b194c 100644 --- a/app/Census/CensusOfFrance1936.php +++ b/app/Census/CensusOfFrance1936.php @@ -37,7 +37,7 @@ class CensusOfFrance1936 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfFrance1946.php b/app/Census/CensusOfFrance1946.php index bdb1fe3044..9bf6547775 100644 --- a/app/Census/CensusOfFrance1946.php +++ b/app/Census/CensusOfFrance1946.php @@ -37,7 +37,7 @@ class CensusOfFrance1946 extends CensusOfFrance implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfScotland.php b/app/Census/CensusOfScotland.php index b5f64cd8f3..a87cb0828c 100644 --- a/app/Census/CensusOfScotland.php +++ b/app/Census/CensusOfScotland.php @@ -27,7 +27,7 @@ class CensusOfScotland extends Census implements CensusPlaceInterface /** * All available censuses for this census place. * - * @return CensusInterface[] + * @return array<CensusInterface> */ public function allCensusDates(): array { diff --git a/app/Census/CensusOfScotland1841.php b/app/Census/CensusOfScotland1841.php index c90fa3ba7d..1c893b3039 100644 --- a/app/Census/CensusOfScotland1841.php +++ b/app/Census/CensusOfScotland1841.php @@ -37,7 +37,7 @@ class CensusOfScotland1841 extends CensusOfScotland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfScotland1851.php b/app/Census/CensusOfScotland1851.php index f39bdba23c..ae541b823f 100644 --- a/app/Census/CensusOfScotland1851.php +++ b/app/Census/CensusOfScotland1851.php @@ -37,7 +37,7 @@ class CensusOfScotland1851 extends CensusOfScotland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfScotland1861.php b/app/Census/CensusOfScotland1861.php index 79f34899f0..68a4523809 100644 --- a/app/Census/CensusOfScotland1861.php +++ b/app/Census/CensusOfScotland1861.php @@ -37,7 +37,7 @@ class CensusOfScotland1861 extends CensusOfScotland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfScotland1871.php b/app/Census/CensusOfScotland1871.php index 4c157e3658..9769b796cb 100644 --- a/app/Census/CensusOfScotland1871.php +++ b/app/Census/CensusOfScotland1871.php @@ -37,7 +37,7 @@ class CensusOfScotland1871 extends CensusOfScotland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfScotland1881.php b/app/Census/CensusOfScotland1881.php index 49c687a2aa..d67b9ac391 100644 --- a/app/Census/CensusOfScotland1881.php +++ b/app/Census/CensusOfScotland1881.php @@ -37,7 +37,7 @@ class CensusOfScotland1881 extends CensusOfScotland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfScotland1891.php b/app/Census/CensusOfScotland1891.php index a5a80770de..e967f52163 100644 --- a/app/Census/CensusOfScotland1891.php +++ b/app/Census/CensusOfScotland1891.php @@ -37,7 +37,7 @@ class CensusOfScotland1891 extends CensusOfScotland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfScotland1901.php b/app/Census/CensusOfScotland1901.php index b91453a140..f72451beca 100644 --- a/app/Census/CensusOfScotland1901.php +++ b/app/Census/CensusOfScotland1901.php @@ -37,7 +37,7 @@ class CensusOfScotland1901 extends CensusOfScotland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfScotland1911.php b/app/Census/CensusOfScotland1911.php index 6e061127d3..25bde87b5e 100644 --- a/app/Census/CensusOfScotland1911.php +++ b/app/Census/CensusOfScotland1911.php @@ -37,7 +37,7 @@ class CensusOfScotland1911 extends CensusOfScotland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfSlovakia.php b/app/Census/CensusOfSlovakia.php index 1e919c6882..79dc36b26d 100644 --- a/app/Census/CensusOfSlovakia.php +++ b/app/Census/CensusOfSlovakia.php @@ -25,7 +25,7 @@ class CensusOfSlovakia extends Census implements CensusPlaceInterface /** * All available censuses for this census place. * - * @return CensusInterface[] + * @return array<CensusInterface> */ public function allCensusDates(): array { diff --git a/app/Census/CensusOfSlovakia1869.php b/app/Census/CensusOfSlovakia1869.php index 32c89ff403..ab74c9ceb9 100644 --- a/app/Census/CensusOfSlovakia1869.php +++ b/app/Census/CensusOfSlovakia1869.php @@ -35,7 +35,7 @@ class CensusOfSlovakia1869 extends CensusOfSlovakia implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfSlovakia1930.php b/app/Census/CensusOfSlovakia1930.php index 6110ffcd32..f23b955c46 100644 --- a/app/Census/CensusOfSlovakia1930.php +++ b/app/Census/CensusOfSlovakia1930.php @@ -35,7 +35,7 @@ class CensusOfSlovakia1930 extends CensusOfSlovakia implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfSlovakia1940.php b/app/Census/CensusOfSlovakia1940.php index d24459c8e5..17ebcbf654 100644 --- a/app/Census/CensusOfSlovakia1940.php +++ b/app/Census/CensusOfSlovakia1940.php @@ -35,7 +35,7 @@ class CensusOfSlovakia1940 extends CensusOfSlovakia implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfUnitedStates.php b/app/Census/CensusOfUnitedStates.php index bc03b45c20..eb1bd1b13b 100644 --- a/app/Census/CensusOfUnitedStates.php +++ b/app/Census/CensusOfUnitedStates.php @@ -27,7 +27,7 @@ class CensusOfUnitedStates extends Census implements CensusPlaceInterface /** * All available censuses for this census place. * - * @return CensusInterface[] + * @return array<CensusInterface> */ public function allCensusDates(): array { diff --git a/app/Census/CensusOfUnitedStates1790.php b/app/Census/CensusOfUnitedStates1790.php index 40b1357c95..27d675c1bd 100644 --- a/app/Census/CensusOfUnitedStates1790.php +++ b/app/Census/CensusOfUnitedStates1790.php @@ -37,7 +37,7 @@ class CensusOfUnitedStates1790 extends CensusOfUnitedStates implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfUnitedStates1800.php b/app/Census/CensusOfUnitedStates1800.php index e8b19a3641..bd46a60a20 100644 --- a/app/Census/CensusOfUnitedStates1800.php +++ b/app/Census/CensusOfUnitedStates1800.php @@ -37,7 +37,7 @@ class CensusOfUnitedStates1800 extends CensusOfUnitedStates implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfUnitedStates1810.php b/app/Census/CensusOfUnitedStates1810.php index 110d454055..d9894d060c 100644 --- a/app/Census/CensusOfUnitedStates1810.php +++ b/app/Census/CensusOfUnitedStates1810.php @@ -37,7 +37,7 @@ class CensusOfUnitedStates1810 extends CensusOfUnitedStates implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfUnitedStates1820.php b/app/Census/CensusOfUnitedStates1820.php index a34d6ce12f..e0883f3a1c 100644 --- a/app/Census/CensusOfUnitedStates1820.php +++ b/app/Census/CensusOfUnitedStates1820.php @@ -37,7 +37,7 @@ class CensusOfUnitedStates1820 extends CensusOfUnitedStates implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array diff --git a/app/Census/CensusOfUnitedStates1830.php b/app/Census/CensusOfUnitedStates1830.php index 0e462fa7ae..8b423a52ea 100644 --- a/app/Census/CensusOfUnitedStates1830.php +++ b/app/Census/CensusOfUnitedStates1830.php @@ -37,7 +37,7 @@ class CensusOfUnitedStates1830 extends CensusOfUnitedStates implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfUnitedStates1840.php b/app/Census/CensusOfUnitedStates1840.php index 0357b1cc93..c170cfde93 100644 --- a/app/Census/CensusOfUnitedStates1840.php +++ b/app/Census/CensusOfUnitedStates1840.php @@ -37,7 +37,7 @@ class CensusOfUnitedStates1840 extends CensusOfUnitedStates implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfUnitedStates1850.php b/app/Census/CensusOfUnitedStates1850.php index 7adbee9b79..92b50d9aa5 100644 --- a/app/Census/CensusOfUnitedStates1850.php +++ b/app/Census/CensusOfUnitedStates1850.php @@ -37,7 +37,7 @@ class CensusOfUnitedStates1850 extends CensusOfUnitedStates implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfUnitedStates1860.php b/app/Census/CensusOfUnitedStates1860.php index 6480170b02..19a2dae11a 100644 --- a/app/Census/CensusOfUnitedStates1860.php +++ b/app/Census/CensusOfUnitedStates1860.php @@ -37,7 +37,7 @@ class CensusOfUnitedStates1860 extends CensusOfUnitedStates implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfUnitedStates1870.php b/app/Census/CensusOfUnitedStates1870.php index 41988a6973..502b8716a8 100644 --- a/app/Census/CensusOfUnitedStates1870.php +++ b/app/Census/CensusOfUnitedStates1870.php @@ -37,7 +37,7 @@ class CensusOfUnitedStates1870 extends CensusOfUnitedStates implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfUnitedStates1880.php b/app/Census/CensusOfUnitedStates1880.php index bfb082a7c3..59c0933edf 100644 --- a/app/Census/CensusOfUnitedStates1880.php +++ b/app/Census/CensusOfUnitedStates1880.php @@ -37,7 +37,7 @@ class CensusOfUnitedStates1880 extends CensusOfUnitedStates implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfUnitedStates1890.php b/app/Census/CensusOfUnitedStates1890.php index d2ec55b7e6..f483be9053 100644 --- a/app/Census/CensusOfUnitedStates1890.php +++ b/app/Census/CensusOfUnitedStates1890.php @@ -37,7 +37,7 @@ class CensusOfUnitedStates1890 extends CensusOfUnitedStates implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfUnitedStates1900.php b/app/Census/CensusOfUnitedStates1900.php index d8c03013b4..d2eafa3ea8 100644 --- a/app/Census/CensusOfUnitedStates1900.php +++ b/app/Census/CensusOfUnitedStates1900.php @@ -37,7 +37,7 @@ class CensusOfUnitedStates1900 extends CensusOfUnitedStates implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfUnitedStates1910.php b/app/Census/CensusOfUnitedStates1910.php index bd7de8a621..788b2f0d24 100644 --- a/app/Census/CensusOfUnitedStates1910.php +++ b/app/Census/CensusOfUnitedStates1910.php @@ -37,7 +37,7 @@ class CensusOfUnitedStates1910 extends CensusOfUnitedStates implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfUnitedStates1920.php b/app/Census/CensusOfUnitedStates1920.php index e5b7728f23..47e0d98b02 100644 --- a/app/Census/CensusOfUnitedStates1920.php +++ b/app/Census/CensusOfUnitedStates1920.php @@ -37,7 +37,7 @@ class CensusOfUnitedStates1920 extends CensusOfUnitedStates implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfUnitedStates1930.php b/app/Census/CensusOfUnitedStates1930.php index 11015e4e60..01f2d423af 100644 --- a/app/Census/CensusOfUnitedStates1930.php +++ b/app/Census/CensusOfUnitedStates1930.php @@ -37,7 +37,7 @@ class CensusOfUnitedStates1930 extends CensusOfUnitedStates implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfUnitedStates1940.php b/app/Census/CensusOfUnitedStates1940.php index f7cfac5f2c..fce97aa6f1 100644 --- a/app/Census/CensusOfUnitedStates1940.php +++ b/app/Census/CensusOfUnitedStates1940.php @@ -37,7 +37,7 @@ class CensusOfUnitedStates1940 extends CensusOfUnitedStates implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfUnitedStates1950.php b/app/Census/CensusOfUnitedStates1950.php index 2e2a09e41f..6329170556 100644 --- a/app/Census/CensusOfUnitedStates1950.php +++ b/app/Census/CensusOfUnitedStates1950.php @@ -37,7 +37,7 @@ class CensusOfUnitedStates1950 extends CensusOfUnitedStates implements CensusInt /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfWales.php b/app/Census/CensusOfWales.php index c589df0bce..a90cda8000 100644 --- a/app/Census/CensusOfWales.php +++ b/app/Census/CensusOfWales.php @@ -27,7 +27,7 @@ class CensusOfWales extends Census implements CensusPlaceInterface /** * All available censuses for this census place. * - * @return CensusInterface[] + * @return array<CensusInterface> */ public function allCensusDates(): array { diff --git a/app/Census/CensusOfWales1841.php b/app/Census/CensusOfWales1841.php index efc6e7b36c..5199f3217a 100644 --- a/app/Census/CensusOfWales1841.php +++ b/app/Census/CensusOfWales1841.php @@ -37,7 +37,7 @@ class CensusOfWales1841 extends CensusOfWales implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfWales1851.php b/app/Census/CensusOfWales1851.php index b8f00fe0fb..693776cdde 100644 --- a/app/Census/CensusOfWales1851.php +++ b/app/Census/CensusOfWales1851.php @@ -37,7 +37,7 @@ class CensusOfWales1851 extends CensusOfWales implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfWales1861.php b/app/Census/CensusOfWales1861.php index 1c0585c045..47bba24cb0 100644 --- a/app/Census/CensusOfWales1861.php +++ b/app/Census/CensusOfWales1861.php @@ -37,7 +37,7 @@ class CensusOfWales1861 extends CensusOfWales implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfWales1871.php b/app/Census/CensusOfWales1871.php index bd38039ce1..fc8d40b82d 100644 --- a/app/Census/CensusOfWales1871.php +++ b/app/Census/CensusOfWales1871.php @@ -37,7 +37,7 @@ class CensusOfWales1871 extends CensusOfWales implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfWales1881.php b/app/Census/CensusOfWales1881.php index 067266d992..062726dcae 100644 --- a/app/Census/CensusOfWales1881.php +++ b/app/Census/CensusOfWales1881.php @@ -37,7 +37,7 @@ class CensusOfWales1881 extends CensusOfWales implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfWales1891.php b/app/Census/CensusOfWales1891.php index bcca31e39a..4faaf01f27 100644 --- a/app/Census/CensusOfWales1891.php +++ b/app/Census/CensusOfWales1891.php @@ -37,7 +37,7 @@ class CensusOfWales1891 extends CensusOfWales implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfWales1901.php b/app/Census/CensusOfWales1901.php index 7bfd6d5d20..1483c001fd 100644 --- a/app/Census/CensusOfWales1901.php +++ b/app/Census/CensusOfWales1901.php @@ -37,7 +37,7 @@ class CensusOfWales1901 extends CensusOfWales implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusOfWales1911.php b/app/Census/CensusOfWales1911.php index ec576d1fa9..54fdf23294 100644 --- a/app/Census/CensusOfWales1911.php +++ b/app/Census/CensusOfWales1911.php @@ -37,7 +37,7 @@ class CensusOfWales1911 extends CensusOfWales implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/CensusPlaceInterface.php b/app/Census/CensusPlaceInterface.php index 9b672d9121..03817fc50f 100644 --- a/app/Census/CensusPlaceInterface.php +++ b/app/Census/CensusPlaceInterface.php @@ -27,7 +27,7 @@ interface CensusPlaceInterface /** * All available censuses for this census place. * - * @return CensusInterface[] + * @return array<CensusInterface> */ public function allCensusDates(): array; diff --git a/app/Census/RegisterOfEngland1939.php b/app/Census/RegisterOfEngland1939.php index 5b47a76d39..ecd933054a 100644 --- a/app/Census/RegisterOfEngland1939.php +++ b/app/Census/RegisterOfEngland1939.php @@ -37,7 +37,7 @@ class RegisterOfEngland1939 extends CensusOfEngland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/RegisterOfScotland1939.php b/app/Census/RegisterOfScotland1939.php index c1d74a7917..a2be638559 100644 --- a/app/Census/RegisterOfScotland1939.php +++ b/app/Census/RegisterOfScotland1939.php @@ -37,7 +37,7 @@ class RegisterOfScotland1939 extends CensusOfScotland implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Census/RegisterOfWales1939.php b/app/Census/RegisterOfWales1939.php index 9a5a20d93f..e6935111f1 100644 --- a/app/Census/RegisterOfWales1939.php +++ b/app/Census/RegisterOfWales1939.php @@ -37,7 +37,7 @@ class RegisterOfWales1939 extends CensusOfWales implements CensusInterface /** * The columns of the census. * - * @return CensusColumnInterface[] + * @return array<CensusColumnInterface> */ public function columns(): array { diff --git a/app/Date/AbstractCalendarDate.php b/app/Date/AbstractCalendarDate.php index 61db993e44..da7bdea35d 100644 --- a/app/Date/AbstractCalendarDate.php +++ b/app/Date/AbstractCalendarDate.php @@ -349,7 +349,7 @@ abstract class AbstractCalendarDate * * @param AbstractCalendarDate $date * - * @return int[] Age in years/months/days + * @return array<int> Age in years/months/days */ public function ageDifference(AbstractCalendarDate $date): array { @@ -833,7 +833,7 @@ abstract class AbstractCalendarDate /** * Which months follows this one? Calendars with leap-months should provide their own implementation. * - * @return int[] + * @return array<int> */ protected function nextMonth(): array { @@ -846,7 +846,7 @@ abstract class AbstractCalendarDate /** * Get today’s date in the current calendar. * - * @return int[] + * @return array<int> */ public function todayYmd(): array { diff --git a/app/Date/JewishDate.php b/app/Date/JewishDate.php index 75267a7d7e..bacdc8f5d1 100644 --- a/app/Date/JewishDate.php +++ b/app/Date/JewishDate.php @@ -331,7 +331,7 @@ class JewishDate extends AbstractCalendarDate /** * Which months follows this one? Calendars with leap-months should provide their own implementation. * - * @return int[] + * @return array<int> */ protected function nextMonth(): array { diff --git a/app/DebugBar.php b/app/DebugBar.php index 0cc6e73209..21e04f7bef 100644 --- a/app/DebugBar.php +++ b/app/DebugBar.php @@ -186,8 +186,8 @@ class DebugBar /** * Log an exception/throwable * - * @param string $view - * @param mixed[] $data + * @param string $view + * @param array<mixed> $data * * @return void */ diff --git a/app/DebugBar/ViewCollector.php b/app/DebugBar/ViewCollector.php index 9fa4b00262..d40d79952c 100644 --- a/app/DebugBar/ViewCollector.php +++ b/app/DebugBar/ViewCollector.php @@ -28,8 +28,8 @@ use DebugBar\DataCollector\Renderable; */ class ViewCollector extends DataCollector implements Renderable { - /** @var string[] */ - protected $views = []; + /** @var array<string> */ + protected array $views = []; /** * Add details about a view diff --git a/app/Fact.php b/app/Fact.php index 5316513148..f07a9080e7 100644 --- a/app/Fact.php +++ b/app/Fact.php @@ -526,7 +526,7 @@ class Fact /** * Notes (inline and objects) linked to this fact * - * @return string[]|Note[] + * @return array<string|Note> */ public function getNotes(): array { @@ -552,7 +552,7 @@ class Fact /** * Media objects linked to this fact * - * @return Media[] + * @return array<Media> */ public function getMedia(): array { diff --git a/app/Family.php b/app/Family.php index ce9af4f786..eac902b53f 100644 --- a/app/Family.php +++ b/app/Family.php @@ -308,7 +308,7 @@ class Family extends GedcomRecord /** * Get a list of all marriage dates - for the family lists. * - * @return Date[] + * @return array<Date> */ public function getAllMarriageDates(): array { @@ -326,7 +326,7 @@ class Family extends GedcomRecord /** * Get a list of all marriage places - for the family lists. * - * @return Place[] + * @return array<Place> */ public function getAllMarriagePlaces(): array { diff --git a/app/Functions/FunctionsPrintFacts.php b/app/Functions/FunctionsPrintFacts.php index 5c0a8b504d..ddfcd3329c 100644 --- a/app/Functions/FunctionsPrintFacts.php +++ b/app/Functions/FunctionsPrintFacts.php @@ -21,10 +21,10 @@ namespace Fisharebest\Webtrees\Functions; use Fisharebest\Webtrees\Age; use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\Elements\UnknownElement; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Gedcom; -use Fisharebest\Webtrees\Elements\UnknownElement; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; @@ -650,8 +650,8 @@ class FunctionsPrintFacts * This function prints the input array of SOUR sub-records built by the * getSourceStructure() function. * - * @param Tree $tree - * @param string[]|string[][] $textSOUR + * @param Tree $tree + * @param array<string|array<string>> $textSOUR * * @return string */ diff --git a/app/Functions/FunctionsPrintLists.php b/app/Functions/FunctionsPrintLists.php index 35e836b241..28cc86eefb 100644 --- a/app/Functions/FunctionsPrintLists.php +++ b/app/Functions/FunctionsPrintLists.php @@ -83,7 +83,7 @@ class FunctionsPrintLists /** * Print a list of surnames. * - * @param int[][] $surnames counts of surname by variant + * @param array<array<int>> $surnames counts of surname by variant * @param int $style 1=bullet list, 2=semicolon-separated list, 3=tabulated list with up to 4 columns * @param bool $totals show totals after each name * @param ModuleListInterface|null $module diff --git a/app/GedcomRecord.php b/app/GedcomRecord.php index b06633b343..26cbe23ec1 100644 --- a/app/GedcomRecord.php +++ b/app/GedcomRecord.php @@ -83,10 +83,10 @@ class GedcomRecord /** @var string|null GEDCOM data (after any pending edits) */ protected $pending; - /** @var Fact[] facts extracted from $gedcom/$pending */ + /** @var array<Fact> facts extracted from $gedcom/$pending */ protected $facts; - /** @var string[][] All the names of this individual */ + /** @var array<array<string>> All the names of this individual */ protected $getAllNames; /** @var int|null Cached result */ @@ -523,8 +523,8 @@ class GedcomRecord /** * Extract/format the first fact from a list of facts. * - * @param string[] $facts - * @param int $style + * @param array<string> $facts + * @param int $style * * @return string */ @@ -728,9 +728,9 @@ class GedcomRecord * calendars, place-names in both latin and hebrew character sets, etc. * It also allows us to combine dates/places from different events in the summaries. * - * @param string[] $events + * @param array<string> $events * - * @return Date[] + * @return array<Date> */ public function getAllEventDates(array $events): array { @@ -747,9 +747,9 @@ class GedcomRecord /** * Get all the places for a particular type of event * - * @param string[] $events + * @param array<string> $events * - * @return Place[] + * @return array<Place> */ public function getAllEventPlaces(array $events): array { @@ -768,10 +768,10 @@ class GedcomRecord /** * The facts and events for this record. * - * @param string[] $filter - * @param bool $sort - * @param int|null $access_level - * @param bool $ignore_deleted + * @param array<string> $filter + * @param bool $sort + * @param int|null $access_level + * @param bool $ignore_deleted * * @return Collection<Fact> */ @@ -1117,7 +1117,7 @@ class GedcomRecord * Fetch XREFs of all records linked to a record - when deleting an object, we must * also delete all links to it. * - * @return GedcomRecord[] + * @return array<GedcomRecord> */ public function linkingRecords(): array { diff --git a/app/Helpers/functions.php b/app/Helpers/functions.php index d6064b2f20..4c35fa80e5 100644 --- a/app/Helpers/functions.php +++ b/app/Helpers/functions.php @@ -106,9 +106,9 @@ function redirect(string $url, int $code = StatusCodeInterface::STATUS_FOUND): R /** * Create a response. * - * @param mixed $content - * @param int $code - * @param string[] $headers + * @param mixed $content + * @param int $code + * @param array<string> $headers * * @return ResponseInterface */ @@ -153,8 +153,8 @@ function response($content = '', int $code = StatusCodeInterface::STATUS_OK, arr /** * Generate a URL for a named route. * - * @param string $route_name - * @param array<mixed> $parameters + * @param string $route_name + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Html.php b/app/Html.php index 25b9b68794..6296c9a3ee 100644 --- a/app/Html.php +++ b/app/Html.php @@ -59,8 +59,8 @@ class Html /** * Encode a URL. * - * @param string $path - * @param array<mixed> $data + * @param string $path + * @param array<bool|int|string|array|null> $data * * @return string */ diff --git a/app/Http/Middleware/AuthAdministrator.php b/app/Http/Middleware/AuthAdministrator.php index 94bab8ddaf..0a3596985c 100644 --- a/app/Http/Middleware/AuthAdministrator.php +++ b/app/Http/Middleware/AuthAdministrator.php @@ -58,6 +58,6 @@ class AuthAdministrator implements MiddlewareInterface } // Not logged in. - return redirect(route(LoginPage::class, ['url' => $request->getUri()])); + return redirect(route(LoginPage::class, ['url' => (string) $request->getUri()])); } } diff --git a/app/Http/Middleware/AuthEditor.php b/app/Http/Middleware/AuthEditor.php index c636f28728..4d34840df1 100644 --- a/app/Http/Middleware/AuthEditor.php +++ b/app/Http/Middleware/AuthEditor.php @@ -63,6 +63,6 @@ class AuthEditor implements MiddlewareInterface } // Not logged in. - return redirect(route(LoginPage::class, ['tree' => $tree->name(), 'url' => $request->getUri()])); + return redirect(route(LoginPage::class, ['tree' => $tree->name(), 'url' => (string) $request->getUri()])); } } diff --git a/app/Http/Middleware/AuthLoggedIn.php b/app/Http/Middleware/AuthLoggedIn.php index 3419833555..ef5e12c0d7 100644 --- a/app/Http/Middleware/AuthLoggedIn.php +++ b/app/Http/Middleware/AuthLoggedIn.php @@ -53,7 +53,7 @@ class AuthLoggedIn implements MiddlewareInterface // Not logged in. return redirect(route(LoginPage::class, [ 'tree' => $tree instanceof Tree ? $tree->name() : null, - 'url' => $request->getUri(), + 'url' => (string) $request->getUri(), ])); } } diff --git a/app/Http/Middleware/AuthManager.php b/app/Http/Middleware/AuthManager.php index 54af5ddb65..4c75dc20cb 100644 --- a/app/Http/Middleware/AuthManager.php +++ b/app/Http/Middleware/AuthManager.php @@ -63,6 +63,6 @@ class AuthManager implements MiddlewareInterface } // Not logged in. - return redirect(route(LoginPage::class, ['tree' => $tree->name(), 'url' => $request->getUri()])); + return redirect(route(LoginPage::class, ['tree' => $tree->name(), 'url' => (string) $request->getUri()])); } } diff --git a/app/Http/Middleware/AuthMember.php b/app/Http/Middleware/AuthMember.php index 03974d9003..258a93be90 100644 --- a/app/Http/Middleware/AuthMember.php +++ b/app/Http/Middleware/AuthMember.php @@ -63,6 +63,6 @@ class AuthMember implements MiddlewareInterface } // Not logged in. - return redirect(route(LoginPage::class, ['tree' => $tree->name(), 'url' => $request->getUri()])); + return redirect(route(LoginPage::class, ['tree' => $tree->name(), 'url' => (string) $request->getUri()])); } } diff --git a/app/Http/Middleware/AuthModerator.php b/app/Http/Middleware/AuthModerator.php index 22764f9637..4e3e1d18ac 100644 --- a/app/Http/Middleware/AuthModerator.php +++ b/app/Http/Middleware/AuthModerator.php @@ -63,6 +63,6 @@ class AuthModerator implements MiddlewareInterface } // Not logged in. - return redirect(route(LoginPage::class, ['tree' => $tree->name(), 'url' => $request->getUri()])); + return redirect(route(LoginPage::class, ['tree' => $tree->name(), 'url' => (string) $request->getUri()])); } } diff --git a/app/Http/Middleware/CheckForMaintenanceMode.php b/app/Http/Middleware/CheckForMaintenanceMode.php index f6e947003e..d636935f07 100644 --- a/app/Http/Middleware/CheckForMaintenanceMode.php +++ b/app/Http/Middleware/CheckForMaintenanceMode.php @@ -42,7 +42,7 @@ class CheckForMaintenanceMode implements MiddlewareInterface, StatusCodeInterfac if (file_exists(Webtrees::OFFLINE_FILE)) { $html = view('layouts/offline', [ 'message' => file_get_contents(Webtrees::OFFLINE_FILE), - 'url' => $request->getUri(), + 'url' => (string) $request->getUri(), ]); return response($html, StatusCodeInterface::STATUS_SERVICE_UNAVAILABLE); diff --git a/app/Http/RequestHandlers/CalendarEvents.php b/app/Http/RequestHandlers/CalendarEvents.php index a3588b201a..dda54a7c07 100644 --- a/app/Http/RequestHandlers/CalendarEvents.php +++ b/app/Http/RequestHandlers/CalendarEvents.php @@ -274,10 +274,10 @@ class CalendarEvents implements RequestHandlerInterface /** * Format a list of facts for display * - * @param string[] $list - * @param string $tag1 - * @param string $tag2 - * @param Tree $tree + * @param array<string> $list + * @param string $tag1 + * @param string $tag2 + * @param Tree $tree * * @return string */ diff --git a/app/Http/RequestHandlers/CheckTree.php b/app/Http/RequestHandlers/CheckTree.php index 33dace3523..dbf9507a6a 100644 --- a/app/Http/RequestHandlers/CheckTree.php +++ b/app/Http/RequestHandlers/CheckTree.php @@ -268,12 +268,12 @@ class CheckTree implements RequestHandlerInterface } /** - * @param string $type - * @param string[][] $links - * @param string $xref1 - * @param string $xref2 - * @param string $link - * @param string[] $reciprocal + * @param string $type + * @param array<array<string>> $links + * @param string $xref1 + * @param string $xref2 + * @param string $link + * @param array<string> $reciprocal * * @return bool */ diff --git a/app/Http/RequestHandlers/HelpText.php b/app/Http/RequestHandlers/HelpText.php index f9bc22ec04..1f4d642a27 100644 --- a/app/Http/RequestHandlers/HelpText.php +++ b/app/Http/RequestHandlers/HelpText.php @@ -316,7 +316,7 @@ class HelpText implements RequestHandlerInterface /** * Format GEDCOM dates in the local language. * - * @param string[]|int[] $gedcom_dates + * @param array<string>|array<int> $gedcom_dates * * @return array<string> */ diff --git a/app/Http/RequestHandlers/ImportThumbnailsData.php b/app/Http/RequestHandlers/ImportThumbnailsData.php index b2d6496c30..9d2c77a11c 100644 --- a/app/Http/RequestHandlers/ImportThumbnailsData.php +++ b/app/Http/RequestHandlers/ImportThumbnailsData.php @@ -243,7 +243,7 @@ class ImportThumbnailsData implements RequestHandlerInterface * @param FilesystemOperator $filesystem * @param string $path * - * @return int[][] + * @return array<array<int>> */ private function scaledImagePixels(FilesystemOperator $filesystem, string $path): array { diff --git a/app/Http/RequestHandlers/SearchAdvancedPage.php b/app/Http/RequestHandlers/SearchAdvancedPage.php index eff3b9a6e1..d563570536 100644 --- a/app/Http/RequestHandlers/SearchAdvancedPage.php +++ b/app/Http/RequestHandlers/SearchAdvancedPage.php @@ -180,7 +180,7 @@ class SearchAdvancedPage implements RequestHandlerInterface /** * Extra search fields to add to the advanced search * - * @param string[] $fields + * @param array<string> $fields * * @return array<string,string> */ diff --git a/app/Http/RequestHandlers/SearchReplaceAction.php b/app/Http/RequestHandlers/SearchReplaceAction.php index 66c9df6c4d..6b7f0eaee8 100644 --- a/app/Http/RequestHandlers/SearchReplaceAction.php +++ b/app/Http/RequestHandlers/SearchReplaceAction.php @@ -152,7 +152,7 @@ class SearchReplaceAction implements RequestHandlerInterface * @param Collection<GedcomRecord> $records * @param string $search * @param string $replace - * @param string[] $name_tags + * @param array<string> $name_tags * * @return int */ diff --git a/app/Http/ViewResponseTrait.php b/app/Http/ViewResponseTrait.php index b6497090c4..4752fec35d 100644 --- a/app/Http/ViewResponseTrait.php +++ b/app/Http/ViewResponseTrait.php @@ -35,9 +35,9 @@ trait ViewResponseTrait protected string $layout = 'layouts/default'; /** - * @param string $view_name - * @param mixed[] $view_data - * @param int $status + * @param string $view_name + * @param array<mixed> $view_data + * @param int $status * * @return ResponseInterface */ diff --git a/app/Individual.php b/app/Individual.php index 6c6dc2bdfb..fa0e974435 100644 --- a/app/Individual.php +++ b/app/Individual.php @@ -371,10 +371,10 @@ class Individual extends GedcomRecord * Display the prefered image for this individual. * Use an icon if no image is available. * - * @param int $width Pixels - * @param int $height Pixels - * @param string $fit "crop" or "contain" - * @param string[] $attributes Additional HTML attributes + * @param int $width Pixels + * @param int $height Pixels + * @param string $fit "crop" or "contain" + * @param array<string> $attributes Additional HTML attributes * * @return string */ @@ -487,7 +487,7 @@ class Individual extends GedcomRecord /** * Get all the birth dates - for the individual lists. * - * @return Date[] + * @return array<Date> */ public function getAllBirthDates(): array { @@ -505,7 +505,7 @@ class Individual extends GedcomRecord /** * Gat all the birth places - for the individual lists. * - * @return Place[] + * @return array<Place> */ public function getAllBirthPlaces(): array { @@ -523,7 +523,7 @@ class Individual extends GedcomRecord /** * Get all the death dates - for the individual lists. * - * @return Date[] + * @return array<Date> */ public function getAllDeathDates(): array { @@ -541,7 +541,7 @@ class Individual extends GedcomRecord /** * Get all the death places - for the individual lists. * - * @return Place[] + * @return array<Place> */ public function getAllDeathPlaces(): array { diff --git a/app/Log.php b/app/Log.php index 0a75b06a17..c82ab56473 100644 --- a/app/Log.php +++ b/app/Log.php @@ -130,8 +130,8 @@ class Log * Unlike most webtrees activity, search is not restricted to a single tree, * so we need to record which trees were searched. * - * @param string $message - * @param Tree[] $trees Which trees were searched + * @param string $message + * @param array<Tree> $trees Which trees were searched * * @return void */ diff --git a/app/Menu.php b/app/Menu.php index cc36f1c183..fec90b1086 100644 --- a/app/Menu.php +++ b/app/Menu.php @@ -33,20 +33,20 @@ class Menu /** @var string The CSS class used to style this menu item */ private $class; - /** @var string[] A list of optional HTML attributes, such as onclick or data-xxx */ + /** @var array<string> A list of optional HTML attributes, such as onclick or data-xxx */ private $attrs; - /** @var Menu[] An optional list of sub-menus. */ + /** @var array<Menu> An optional list of sub-menus. */ private $submenus; /** * Constructor for the menu class * - * @param string $label The label for the menu item - * @param string $link The target URL - * @param string $class A CSS class - * @param string[] $attrs Optional attributes, such as onclick or data-xxx - * @param Menu[] $submenus Any submenus + * @param string $label The label for the menu item + * @param string $link The target URL + * @param string $class A CSS class + * @param array<string> $attrs Optional attributes, such as onclick or data-xxx + * @param array<Menu> $submenus Any submenus */ public function __construct( string $label, @@ -76,7 +76,7 @@ class Menu /** * Set the optional attributes. * - * @param string[] $attrs + * @param array<string> $attrs * * @return $this */ @@ -176,7 +176,7 @@ class Menu /** * Get the sub-menus. * - * @return Menu[] + * @return array<Menu> */ public function getSubmenus(): array { @@ -186,7 +186,7 @@ class Menu /** * Set the sub-menus. * - * @param Menu[] $submenus + * @param array<Menu> $submenus * * @return $this */ diff --git a/app/Module/AncestorsChartModule.php b/app/Module/AncestorsChartModule.php index 4d4d5a051f..550acec829 100644 --- a/app/Module/AncestorsChartModule.php +++ b/app/Module/AncestorsChartModule.php @@ -157,8 +157,8 @@ class AncestorsChartModule extends AbstractModule implements ModuleChartInterfac /** * The URL for a page showing chart options. * - * @param Individual $individual - * @param mixed[] $parameters + * @param Individual $individual + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Module/BingWebmasterToolsModule.php b/app/Module/BingWebmasterToolsModule.php index 52e4cfeae1..b6a5b5ff9e 100644 --- a/app/Module/BingWebmasterToolsModule.php +++ b/app/Module/BingWebmasterToolsModule.php @@ -96,7 +96,7 @@ class BingWebmasterToolsModule extends AbstractModule implements ModuleAnalytics /** * Embed placeholders in the snippet. * - * @param string[] $parameters + * @param array<string> $parameters * * @return string */ diff --git a/app/Module/BranchesListModule.php b/app/Module/BranchesListModule.php index f5e053a436..885fc1ea82 100644 --- a/app/Module/BranchesListModule.php +++ b/app/Module/BranchesListModule.php @@ -23,11 +23,11 @@ use Aura\Router\RouterContainer; use Fig\Http\Message\RequestMethodInterface; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Soundex; use Fisharebest\Webtrees\Tree; @@ -126,8 +126,8 @@ class BranchesListModule extends AbstractModule implements ModuleListInterface, } /** - * @param Tree $tree - * @param mixed[] $parameters + * @param Tree $tree + * @param array<bool|int|string|array|null> $parameters * * @return string */ @@ -246,7 +246,7 @@ class BranchesListModule extends AbstractModule implements ModuleListInterface, * * @param Individual $individual * - * @return Individual[] + * @return array<Individual> */ private function allAncestors(Individual $individual): array { @@ -280,7 +280,7 @@ class BranchesListModule extends AbstractModule implements ModuleListInterface, * @param bool $soundex_dm * @param bool $soundex_std * - * @return Individual[] + * @return array<Individual> */ private function loadIndividuals(Tree $tree, string $surname, bool $soundex_dm, bool $soundex_std): array { @@ -330,12 +330,12 @@ class BranchesListModule extends AbstractModule implements ModuleListInterface, /** * For each individual with no ancestors, list their descendants. * - * @param Tree $tree - * @param Individual[] $individuals - * @param Individual[] $ancestors - * @param string $surname - * @param bool $soundex_dm - * @param bool $soundex_std + * @param Tree $tree + * @param array<Individual> $individuals + * @param array<Individual> $ancestors + * @param string $surname + * @param bool $soundex_dm + * @param bool $soundex_std * * @return string */ @@ -360,14 +360,14 @@ class BranchesListModule extends AbstractModule implements ModuleListInterface, * Generate a recursive list of descendants of an individual. * If parents are specified, we can also show the pedigree (adopted, etc.). * - * @param Tree $tree - * @param Individual[] $individuals - * @param Individual[] $ancestors - * @param string $surname - * @param bool $soundex_dm - * @param bool $soundex_std - * @param Individual $individual - * @param Family|null $parents + * @param Tree $tree + * @param array<Individual> $individuals + * @param array<Individual> $ancestors + * @param string $surname + * @param bool $soundex_dm + * @param bool $soundex_std + * @param Individual $individual + * @param Family|null $parents * * @return string */ diff --git a/app/Module/CensusAssistantModule.php b/app/Module/CensusAssistantModule.php index 0a3ca87946..663fa27ebc 100644 --- a/app/Module/CensusAssistantModule.php +++ b/app/Module/CensusAssistantModule.php @@ -20,9 +20,9 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Census\CensusInterface; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; @@ -164,12 +164,12 @@ class CensusAssistantModule extends AbstractModule } /** - * @param CensusInterface $census - * @param string $ca_title - * @param string $ca_place - * @param string $ca_citation - * @param string[][] $ca_individuals - * @param string $ca_notes + * @param CensusInterface $census + * @param string $ca_title + * @param string $ca_place + * @param string $ca_citation + * @param array<array<string>> $ca_individuals + * @param string $ca_notes * * @return string */ diff --git a/app/Module/ChartsBlockModule.php b/app/Module/ChartsBlockModule.php index 736ad511e0..f6bcda443e 100644 --- a/app/Module/ChartsBlockModule.php +++ b/app/Module/ChartsBlockModule.php @@ -83,10 +83,10 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/ClippingsCartModule.php b/app/Module/ClippingsCartModule.php index d912db0a96..0a55d20de0 100644 --- a/app/Module/ClippingsCartModule.php +++ b/app/Module/ClippingsCartModule.php @@ -457,7 +457,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface * * @param Tree $tree * - * @return GedcomRecord[] + * @return array<GedcomRecord> */ private function allRecordsInCart(Tree $tree): array { diff --git a/app/Module/CloudsTheme.php b/app/Module/CloudsTheme.php index 9ccd28b889..8195dcb607 100644 --- a/app/Module/CloudsTheme.php +++ b/app/Module/CloudsTheme.php @@ -70,7 +70,7 @@ class CloudsTheme extends AbstractModule implements ModuleThemeInterface * * @param Tree|null $tree * - * @return Menu[] + * @return array<Menu> */ public function genealogyMenu(?Tree $tree): array { diff --git a/app/Module/ColorsTheme.php b/app/Module/ColorsTheme.php index a8358a6299..d89973ce3a 100644 --- a/app/Module/ColorsTheme.php +++ b/app/Module/ColorsTheme.php @@ -58,7 +58,7 @@ class ColorsTheme extends CloudsTheme * * @param Tree|null $tree * - * @return Menu[] + * @return array<Menu> */ public function userMenu(?Tree $tree): array { diff --git a/app/Module/CompactTreeChartModule.php b/app/Module/CompactTreeChartModule.php index e099768e39..35937a8e0d 100644 --- a/app/Module/CompactTreeChartModule.php +++ b/app/Module/CompactTreeChartModule.php @@ -134,8 +134,8 @@ class CompactTreeChartModule extends AbstractModule implements ModuleChartInterf /** * The URL for a page showing chart options. * - * @param Individual $individual - * @param mixed[] $parameters + * @param Individual $individual + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Module/DescendancyChartModule.php b/app/Module/DescendancyChartModule.php index 8bc9c7ff3e..1382263a9a 100644 --- a/app/Module/DescendancyChartModule.php +++ b/app/Module/DescendancyChartModule.php @@ -158,7 +158,7 @@ class DescendancyChartModule extends AbstractModule implements ModuleChartInterf * The URL for a page showing chart options. * * @param Individual $individual - * @param mixed[] $parameters + * @paramarray $parameters * * @return string */ diff --git a/app/Module/FamilyBookChartModule.php b/app/Module/FamilyBookChartModule.php index 981f60bafa..ca38b9b7c0 100644 --- a/app/Module/FamilyBookChartModule.php +++ b/app/Module/FamilyBookChartModule.php @@ -22,10 +22,10 @@ namespace Fisharebest\Webtrees\Module; use Aura\Router\RouterContainer; use Fig\Http\Message\RequestMethodInterface; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Menu; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; @@ -141,8 +141,8 @@ class FamilyBookChartModule extends AbstractModule implements ModuleChartInterfa /** * The URL for a page showing chart options. * - * @param Individual $individual - * @param mixed[] $parameters + * @param Individual $individual + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Module/FamilyTreeFavoritesModule.php b/app/Module/FamilyTreeFavoritesModule.php index ffca1fc1ed..a511d5950e 100644 --- a/app/Module/FamilyTreeFavoritesModule.php +++ b/app/Module/FamilyTreeFavoritesModule.php @@ -20,10 +20,10 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\Http\RequestHandlers\TreePage; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Str; @@ -65,10 +65,10 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/FamilyTreeNewsModule.php b/app/Module/FamilyTreeNewsModule.php index e01278c91c..48bdf939cb 100644 --- a/app/Module/FamilyTreeNewsModule.php +++ b/app/Module/FamilyTreeNewsModule.php @@ -69,10 +69,10 @@ class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterfac /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/FamilyTreeStatisticsModule.php b/app/Module/FamilyTreeStatisticsModule.php index ea6d913dff..dbf098f90d 100644 --- a/app/Module/FamilyTreeStatisticsModule.php +++ b/app/Module/FamilyTreeStatisticsModule.php @@ -66,10 +66,10 @@ class FamilyTreeStatisticsModule extends AbstractModule implements ModuleBlockIn /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/GoogleAnalyticsModule.php b/app/Module/GoogleAnalyticsModule.php index 514b3b0ded..0dda4e271e 100644 --- a/app/Module/GoogleAnalyticsModule.php +++ b/app/Module/GoogleAnalyticsModule.php @@ -89,7 +89,7 @@ class GoogleAnalyticsModule extends AbstractModule implements ModuleAnalyticsInt /** * Embed placeholders in the snippet. * - * @param string[] $parameters + * @param array<string> $parameters * * @return string */ diff --git a/app/Module/GoogleWebmasterToolsModule.php b/app/Module/GoogleWebmasterToolsModule.php index d1a44952e5..aaa0840ee6 100644 --- a/app/Module/GoogleWebmasterToolsModule.php +++ b/app/Module/GoogleWebmasterToolsModule.php @@ -96,7 +96,7 @@ class GoogleWebmasterToolsModule extends AbstractModule implements ModuleAnalyti /** * Embed placeholders in the snippet. * - * @param string[] $parameters + * @param array<string> $parameters * * @return string */ diff --git a/app/Module/HourglassChartModule.php b/app/Module/HourglassChartModule.php index 4ecfc05be6..1505b175a3 100644 --- a/app/Module/HourglassChartModule.php +++ b/app/Module/HourglassChartModule.php @@ -139,8 +139,8 @@ class HourglassChartModule extends AbstractModule implements ModuleChartInterfac /** * The URL for a page showing chart options. * - * @param Individual $individual - * @param mixed[] $parameters + * @param Individual $individual + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Module/HtmlBlockModule.php b/app/Module/HtmlBlockModule.php index 06126a3ace..3e25aba847 100644 --- a/app/Module/HtmlBlockModule.php +++ b/app/Module/HtmlBlockModule.php @@ -72,10 +72,10 @@ class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/IndividualListModule.php b/app/Module/IndividualListModule.php index e722dfebb7..8dc1ce5939 100644 --- a/app/Module/IndividualListModule.php +++ b/app/Module/IndividualListModule.php @@ -23,12 +23,12 @@ use Aura\Router\RouterContainer; use Fisharebest\Localization\Locale\LocaleInterface; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Functions\FunctionsPrintLists; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\LocalizationService; use Fisharebest\Webtrees\Session; use Fisharebest\Webtrees\Tree; @@ -121,8 +121,8 @@ class IndividualListModule extends AbstractModule implements ModuleListInterface } /** - * @param Tree $tree - * @param mixed[] $parameters + * @param Tree $tree + * @param array<bool|int|string|array|null> $parameters * * @return string */ @@ -553,7 +553,7 @@ class IndividualListModule extends AbstractModule implements ModuleListInterface * @param bool $fams if set, only consider individuals with FAMS records * @param LocaleInterface $locale * - * @return int[] + * @return array<int> */ public function surnameAlpha(Tree $tree, bool $marnm, bool $fams, LocaleInterface $locale): array { @@ -617,7 +617,7 @@ class IndividualListModule extends AbstractModule implements ModuleListInterface * @param bool $fams if set, only consider individuals with FAMS records * @param LocaleInterface $locale * - * @return int[] + * @return array<int> */ public function givenAlpha(Tree $tree, string $surn, string $salpha, bool $marnm, bool $fams, LocaleInterface $locale): array { @@ -684,7 +684,7 @@ class IndividualListModule extends AbstractModule implements ModuleListInterface * @param bool $fams if set, only consider individuals with FAMS records * @param LocaleInterface $locale * - * @return int[][] + * @return array<array<int>> */ public function surnames( Tree $tree, @@ -746,7 +746,7 @@ class IndividualListModule extends AbstractModule implements ModuleListInterface * @param bool $fams if set, only fetch individuals with FAMS records * @param LocaleInterface $locale * - * @return Individual[] + * @return array<Individual> */ public function individuals( Tree $tree, @@ -832,7 +832,7 @@ class IndividualListModule extends AbstractModule implements ModuleListInterface * @param bool $marnm if set, include married names * @param LocaleInterface $locale * - * @return Family[] + * @return array<Family> */ public function families(Tree $tree, string $surn, string $salpha, string $galpha, bool $marnm, LocaleInterface $locale): array { diff --git a/app/Module/InteractiveTreeModule.php b/app/Module/InteractiveTreeModule.php index 3fa2433efd..c56bb90c03 100644 --- a/app/Module/InteractiveTreeModule.php +++ b/app/Module/InteractiveTreeModule.php @@ -164,8 +164,8 @@ class InteractiveTreeModule extends AbstractModule implements ModuleChartInterfa /** * The URL for this chart. * - * @param Individual $individual - * @param mixed[] $parameters + * @param Individual $individual + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Module/LifespansChartModule.php b/app/Module/LifespansChartModule.php index 6aff316e03..f4a5bb6f30 100644 --- a/app/Module/LifespansChartModule.php +++ b/app/Module/LifespansChartModule.php @@ -134,8 +134,8 @@ class LifespansChartModule extends AbstractModule implements ModuleChartInterfac /** * The URL for this chart. * - * @param Individual $individual - * @param mixed[] $parameters + * @param Individual $individual + * @param array<bool|int|string|array|null> $parameters * * @return string */ @@ -427,7 +427,7 @@ class LifespansChartModule extends AbstractModule implements ModuleChartInterfac } /** - * @param Individual[] $individuals + * @param array<Individual> $individuals * * @return array<stdClass> */ diff --git a/app/Module/LocationListModule.php b/app/Module/LocationListModule.php index 2c5b2ec8dc..3f4d5f0540 100644 --- a/app/Module/LocationListModule.php +++ b/app/Module/LocationListModule.php @@ -128,8 +128,8 @@ class LocationListModule extends AbstractModule implements ModuleListInterface, } /** - * @param Tree $tree - * @param mixed[] $parameters + * @param Tree $tree + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Module/LoggedInUsersModule.php b/app/Module/LoggedInUsersModule.php index c7208ddc6d..ed778414c4 100644 --- a/app/Module/LoggedInUsersModule.php +++ b/app/Module/LoggedInUsersModule.php @@ -56,10 +56,10 @@ class LoggedInUsersModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/LoginBlockModule.php b/app/Module/LoginBlockModule.php index 613c2be686..2d6b1f8d49 100644 --- a/app/Module/LoginBlockModule.php +++ b/app/Module/LoginBlockModule.php @@ -57,10 +57,10 @@ class LoginBlockModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/MatomoAnalyticsModule.php b/app/Module/MatomoAnalyticsModule.php index 28bb5636ab..72fe95dff1 100644 --- a/app/Module/MatomoAnalyticsModule.php +++ b/app/Module/MatomoAnalyticsModule.php @@ -88,7 +88,7 @@ class MatomoAnalyticsModule extends AbstractModule implements ModuleAnalyticsInt /** * Embed placeholders in the snippet. * - * @param string[] $parameters + * @param array<string> $parameters * * @return string */ diff --git a/app/Module/MediaListModule.php b/app/Module/MediaListModule.php index 98f312ccbd..388889ad5d 100644 --- a/app/Module/MediaListModule.php +++ b/app/Module/MediaListModule.php @@ -104,8 +104,8 @@ class MediaListModule extends AbstractModule implements ModuleListInterface, Req } /** - * @param Tree $tree - * @param mixed[] $parameters + * @param Tree $tree + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Module/ModuleAnalyticsInterface.php b/app/Module/ModuleAnalyticsInterface.php index 2a8134ca37..bf7a5f6af4 100644 --- a/app/Module/ModuleAnalyticsInterface.php +++ b/app/Module/ModuleAnalyticsInterface.php @@ -51,7 +51,7 @@ interface ModuleAnalyticsInterface extends ModuleInterface /** * Embed placeholders in the snippet. * - * @param string[] $parameters + * @param array<string> $parameters * * @return string */ diff --git a/app/Module/ModuleAnalyticsTrait.php b/app/Module/ModuleAnalyticsTrait.php index 4062359b2b..6bfb549499 100644 --- a/app/Module/ModuleAnalyticsTrait.php +++ b/app/Module/ModuleAnalyticsTrait.php @@ -109,7 +109,7 @@ trait ModuleAnalyticsTrait /** * Embed placeholders in the snippet. * - * @param string[] $parameters + * @param array<string> $parameters * * @return string */ diff --git a/app/Module/ModuleBlockInterface.php b/app/Module/ModuleBlockInterface.php index 9cebfa2a28..7b907f7b7e 100644 --- a/app/Module/ModuleBlockInterface.php +++ b/app/Module/ModuleBlockInterface.php @@ -68,10 +68,10 @@ interface ModuleBlockInterface extends ModuleInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param array $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/ModuleBlockTrait.php b/app/Module/ModuleBlockTrait.php index 9bd8729fcd..c8125b7869 100644 --- a/app/Module/ModuleBlockTrait.php +++ b/app/Module/ModuleBlockTrait.php @@ -35,10 +35,10 @@ trait ModuleBlockTrait /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param array $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/ModuleChartInterface.php b/app/Module/ModuleChartInterface.php index 4fc09fc9a9..0d035c494c 100644 --- a/app/Module/ModuleChartInterface.php +++ b/app/Module/ModuleChartInterface.php @@ -64,8 +64,8 @@ interface ModuleChartInterface extends ModuleInterface /** * The URL for a page showing chart options. * - * @param Individual $individual - * @param mixed[] $parameters + * @param Individual $individual + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Module/ModuleChartTrait.php b/app/Module/ModuleChartTrait.php index 4646c5a621..a86bf40dc5 100644 --- a/app/Module/ModuleChartTrait.php +++ b/app/Module/ModuleChartTrait.php @@ -81,8 +81,8 @@ trait ModuleChartTrait /** * The URL for a page showing chart options. * - * @param Individual $individual - * @param mixed[] $parameters + * @param Individual $individual + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Module/ModuleListInterface.php b/app/Module/ModuleListInterface.php index cf83607e12..3653386d8b 100644 --- a/app/Module/ModuleListInterface.php +++ b/app/Module/ModuleListInterface.php @@ -54,8 +54,8 @@ interface ModuleListInterface extends ModuleInterface /** * The URL for a page showing list options. * - * @param Tree $tree - * @param mixed[] $parameters + * @param Tree $tree + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Module/ModuleListTrait.php b/app/Module/ModuleListTrait.php index 6ca0206fdf..ee40b996b4 100644 --- a/app/Module/ModuleListTrait.php +++ b/app/Module/ModuleListTrait.php @@ -71,8 +71,8 @@ trait ModuleListTrait /** * The URL for a page showing list options. * - * @param Tree $tree - * @param mixed[] $parameters + * @param Tree $tree + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Module/ModuleThemeInterface.php b/app/Module/ModuleThemeInterface.php index 25dc31f058..a8572e0a50 100644 --- a/app/Module/ModuleThemeInterface.php +++ b/app/Module/ModuleThemeInterface.php @@ -33,7 +33,7 @@ interface ModuleThemeInterface extends ModuleInterface * * @param Individual $individual * - * @return Menu[] + * @return array<Menu> */ public function individualBoxMenu(Individual $individual): array; @@ -58,7 +58,7 @@ interface ModuleThemeInterface extends ModuleInterface * * @param Tree|null $tree * - * @return Menu[] + * @return array<Menu> */ public function genealogyMenu(?Tree $tree): array; @@ -67,7 +67,7 @@ interface ModuleThemeInterface extends ModuleInterface * * @param Tree|null $tree * - * @return Menu[] + * @return array<Menu> */ public function userMenu(?Tree $tree): array; diff --git a/app/Module/ModuleThemeTrait.php b/app/Module/ModuleThemeTrait.php index 001ee0eeb8..c5d59d7022 100644 --- a/app/Module/ModuleThemeTrait.php +++ b/app/Module/ModuleThemeTrait.php @@ -124,7 +124,7 @@ trait ModuleThemeTrait * * @param Individual $individual * - * @return Menu[] + * @return array<Menu> */ public function individualBoxMenu(Individual $individual): array { @@ -139,7 +139,7 @@ trait ModuleThemeTrait * * @param Individual $individual * - * @return Menu[] + * @return array<Menu> */ public function individualBoxMenuCharts(Individual $individual): array { @@ -163,7 +163,7 @@ trait ModuleThemeTrait * * @param Individual $individual * - * @return Menu[] + * @return array<Menu> */ public function individualBoxMenuFamilyLinks(Individual $individual): array { @@ -472,7 +472,7 @@ trait ModuleThemeTrait * * @param Tree|null $tree * - * @return Menu[] + * @return array<Menu> */ public function genealogyMenu(?Tree $tree): array { @@ -491,7 +491,7 @@ trait ModuleThemeTrait /** * Create the genealogy menu. * - * @param Menu[] $menus + * @param array<Menu> $menus * * @return string */ @@ -507,7 +507,7 @@ trait ModuleThemeTrait * * @param Tree|null $tree * - * @return Menu[] + * @return array<Menu> */ public function userMenu(?Tree $tree): array { diff --git a/app/Module/NoteListModule.php b/app/Module/NoteListModule.php index 3de45fb21c..6964af9a21 100644 --- a/app/Module/NoteListModule.php +++ b/app/Module/NoteListModule.php @@ -92,8 +92,8 @@ class NoteListModule extends AbstractModule implements ModuleListInterface, Requ } /** - * @param Tree $tree - * @param mixed[] $parameters + * @param Tree $tree + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Module/OnThisDayModule.php b/app/Module/OnThisDayModule.php index 75ea6ae380..a0e3cdb621 100644 --- a/app/Module/OnThisDayModule.php +++ b/app/Module/OnThisDayModule.php @@ -115,10 +115,10 @@ class OnThisDayModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/PedigreeChartModule.php b/app/Module/PedigreeChartModule.php index 9609dba4f6..66113f57bb 100644 --- a/app/Module/PedigreeChartModule.php +++ b/app/Module/PedigreeChartModule.php @@ -167,8 +167,8 @@ class PedigreeChartModule extends AbstractModule implements ModuleChartInterface /** * The URL for a page showing chart options. * - * @param Individual $individual - * @param mixed[] $parameters + * @param Individual $individual + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Module/PedigreeMapModule.php b/app/Module/PedigreeMapModule.php index 9b0b901531..135b61c8b8 100644 --- a/app/Module/PedigreeMapModule.php +++ b/app/Module/PedigreeMapModule.php @@ -174,8 +174,8 @@ class PedigreeMapModule extends AbstractModule implements ModuleChartInterface, /** * The URL for a page showing chart options. * - * @param Individual $individual - * @param mixed[] $parameters + * @param Individual $individual + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Module/PlacesModule.php b/app/Module/PlacesModule.php index 78e05015ad..9f7948fe14 100644 --- a/app/Module/PlacesModule.php +++ b/app/Module/PlacesModule.php @@ -24,6 +24,7 @@ use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Place; use Fisharebest\Webtrees\PlaceLocation; use Fisharebest\Webtrees\Services\LeafletJsService; use Fisharebest\Webtrees\Services\ModuleService; @@ -198,7 +199,7 @@ class PlacesModule extends AbstractModule implements ModuleTabInterface * @param Individual $individual * @param Fact $fact * - * @return mixed[] + * @return array<string|Place> */ private function summaryData(Individual $individual, Fact $fact): array { diff --git a/app/Module/RelationshipsChartModule.php b/app/Module/RelationshipsChartModule.php index 71591383e9..11c63a2bcc 100644 --- a/app/Module/RelationshipsChartModule.php +++ b/app/Module/RelationshipsChartModule.php @@ -184,8 +184,8 @@ class RelationshipsChartModule extends AbstractModule implements ModuleChartInte /** * The URL for a page showing chart options. * - * @param Individual $individual - * @param mixed[] $parameters + * @param Individual $individual + * @param array<bool|int|string|array|null> $parameters * * @return string */ @@ -669,8 +669,8 @@ class RelationshipsChartModule extends AbstractModule implements ModuleChartInte * Convert a path (list of XREFs) to an "old-style" string of relationships. * Return an empty array, if privacy rules prevent us viewing any node. * - * @param Tree $tree - * @param string[] $path Alternately Individual / Family + * @param Tree $tree + * @param array<string> $path Alternately Individual / Family * * @return array<string> */ diff --git a/app/Module/RepositoryListModule.php b/app/Module/RepositoryListModule.php index 263c310cbe..381c15eec8 100644 --- a/app/Module/RepositoryListModule.php +++ b/app/Module/RepositoryListModule.php @@ -95,8 +95,8 @@ class RepositoryListModule extends AbstractModule implements ModuleListInterface } /** - * @param Tree $tree - * @param mixed[] $parameters + * @param Tree $tree + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Module/ResearchTaskModule.php b/app/Module/ResearchTaskModule.php index efdd5e88e2..d582a2b23f 100644 --- a/app/Module/ResearchTaskModule.php +++ b/app/Module/ResearchTaskModule.php @@ -77,10 +77,10 @@ class ResearchTaskModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/ReviewChangesModule.php b/app/Module/ReviewChangesModule.php index 17fb4de879..ee1d4c9d7f 100644 --- a/app/Module/ReviewChangesModule.php +++ b/app/Module/ReviewChangesModule.php @@ -22,9 +22,9 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Carbon; use Fisharebest\Webtrees\Contracts\UserInterface; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Http\RequestHandlers\PendingChanges; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\EmailService; use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\Services\UserService; @@ -94,10 +94,10 @@ class ReviewChangesModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/SlideShowModule.php b/app/Module/SlideShowModule.php index f95ad2cd05..457d3dfc3d 100644 --- a/app/Module/SlideShowModule.php +++ b/app/Module/SlideShowModule.php @@ -19,9 +19,9 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Media; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\JoinClause; @@ -64,10 +64,10 @@ class SlideShowModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/SourceListModule.php b/app/Module/SourceListModule.php index bc279dcc4c..3a1891daeb 100644 --- a/app/Module/SourceListModule.php +++ b/app/Module/SourceListModule.php @@ -20,12 +20,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Aura\Router\RouterContainer; +use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; -use Fisharebest\Webtrees\Auth; use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; @@ -94,8 +94,8 @@ class SourceListModule extends AbstractModule implements ModuleListInterface, Re } /** - * @param Tree $tree - * @param mixed[] $parameters + * @param Tree $tree + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Module/StatcounterModule.php b/app/Module/StatcounterModule.php index 6a3b11836d..0c2eae172a 100644 --- a/app/Module/StatcounterModule.php +++ b/app/Module/StatcounterModule.php @@ -87,7 +87,7 @@ class StatcounterModule extends AbstractModule implements ModuleAnalyticsInterfa /** * Embed placeholders in the snippet. * - * @param string[] $parameters + * @param array<string> $parameters * * @return string */ diff --git a/app/Module/StatisticsChartModule.php b/app/Module/StatisticsChartModule.php index 190b809bb3..aef5289778 100644 --- a/app/Module/StatisticsChartModule.php +++ b/app/Module/StatisticsChartModule.php @@ -111,8 +111,8 @@ class StatisticsChartModule extends AbstractModule implements ModuleChartInterfa /** * The URL for this chart. * - * @param Individual $individual - * @param mixed[] $parameters + * @param Individual $individual + * @param array<bool|int|string|array|null> $parameters * * @return string */ @@ -870,12 +870,12 @@ class StatisticsChartModule extends AbstractModule implements ModuleChartInterfa /** * Calculate the Y axis. * - * @param int|string $x - * @param int|string $z - * @param int|string $value - * @param array $x_axis - * @param array $z_axis - * @param int[][] $ydata + * @param int|string $x + * @param int|string $z + * @param int|string $value + * @param array $x_axis + * @param array $z_axis + * @param array<array<int>> $ydata * * @return void */ @@ -903,7 +903,7 @@ class StatisticsChartModule extends AbstractModule implements ModuleChartInterfa * Others need to find the appropriate range. * * @param int|float|string $value - * @param string[] $axis + * @param array<string> $axis * * @return int|string */ @@ -928,13 +928,13 @@ class StatisticsChartModule extends AbstractModule implements ModuleChartInterfa /** * Plot the data. * - * @param string $chart_title - * @param string[] $x_axis - * @param string $x_axis_title - * @param int[][] $ydata - * @param string $y_axis_title - * @param string[] $z_axis - * @param int $y_axis_type + * @param string $chart_title + * @param array<string> $x_axis + * @param string $x_axis_title + * @param array<array<int>> $ydata + * @param string $y_axis_title + * @param array<string> $z_axis + * @param int $y_axis_type * * @return string */ diff --git a/app/Module/SubmitterListModule.php b/app/Module/SubmitterListModule.php index 8b421455b4..1e5d7bbeaf 100644 --- a/app/Module/SubmitterListModule.php +++ b/app/Module/SubmitterListModule.php @@ -20,13 +20,13 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Aura\Router\RouterContainer; +use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Submitter; use Fisharebest\Webtrees\Tree; -use Fisharebest\Webtrees\Auth; use Illuminate\Database\Capsule\Manager as DB; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; @@ -105,8 +105,8 @@ class SubmitterListModule extends AbstractModule implements ModuleListInterface, } /** - * @param Tree $tree - * @param mixed[] $parameters + * @param Tree $tree + * @param array<bool|int|string|array|null> $parameters * * @return string */ diff --git a/app/Module/ThemeSelectModule.php b/app/Module/ThemeSelectModule.php index 397adc150a..dcae0dabe8 100644 --- a/app/Module/ThemeSelectModule.php +++ b/app/Module/ThemeSelectModule.php @@ -59,10 +59,10 @@ class ThemeSelectModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/TimelineChartModule.php b/app/Module/TimelineChartModule.php index bd1653a258..334090273a 100644 --- a/app/Module/TimelineChartModule.php +++ b/app/Module/TimelineChartModule.php @@ -24,10 +24,10 @@ use Fig\Http\Message\RequestMethodInterface; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Date\GregorianDate; use Fisharebest\Webtrees\Fact; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; use Psr\Http\Message\ResponseInterface; @@ -254,9 +254,9 @@ class TimelineChartModule extends AbstractModule implements ModuleChartInterface } /** - * @param Tree $tree - * @param array $xrefs - * @param int $scale + * @param Tree $tree + * @param array<string> $xrefs + * @param int $scale * * @return ResponseInterface */ diff --git a/app/Module/TopGivenNamesModule.php b/app/Module/TopGivenNamesModule.php index 9a74b481bb..2f665c19c5 100644 --- a/app/Module/TopGivenNamesModule.php +++ b/app/Module/TopGivenNamesModule.php @@ -61,10 +61,10 @@ class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/TopPageViewsModule.php b/app/Module/TopPageViewsModule.php index 067a1aa567..df5a694eeb 100644 --- a/app/Module/TopPageViewsModule.php +++ b/app/Module/TopPageViewsModule.php @@ -19,9 +19,9 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Str; @@ -61,10 +61,10 @@ class TopPageViewsModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/TopSurnamesModule.php b/app/Module/TopSurnamesModule.php index 1aa6910f7e..cfcbad94aa 100644 --- a/app/Module/TopSurnamesModule.php +++ b/app/Module/TopSurnamesModule.php @@ -23,8 +23,8 @@ use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Functions\FunctionsPrintLists; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Services\ModuleService; +use Fisharebest\Webtrees\Tree; use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Support\Str; @@ -81,10 +81,10 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/UpcomingAnniversariesModule.php b/app/Module/UpcomingAnniversariesModule.php index 75f0cf10c7..6b9ff547ea 100644 --- a/app/Module/UpcomingAnniversariesModule.php +++ b/app/Module/UpcomingAnniversariesModule.php @@ -119,10 +119,10 @@ class UpcomingAnniversariesModule extends AbstractModule implements ModuleBlockI /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/UserFavoritesModule.php b/app/Module/UserFavoritesModule.php index 3fecf9937a..cd9fc8d9b0 100644 --- a/app/Module/UserFavoritesModule.php +++ b/app/Module/UserFavoritesModule.php @@ -21,10 +21,10 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\Http\RequestHandlers\UserPage; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Str; @@ -66,10 +66,10 @@ class UserFavoritesModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/UserJournalModule.php b/app/Module/UserJournalModule.php index 52c32c4fbd..15c0fff51e 100644 --- a/app/Module/UserJournalModule.php +++ b/app/Module/UserJournalModule.php @@ -69,10 +69,10 @@ class UserJournalModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/UserMessagesModule.php b/app/Module/UserMessagesModule.php index 8a21cb3095..cdfb4367ba 100644 --- a/app/Module/UserMessagesModule.php +++ b/app/Module/UserMessagesModule.php @@ -114,10 +114,10 @@ class UserMessagesModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/UserWelcomeModule.php b/app/Module/UserWelcomeModule.php index a2f0886f37..69c7154d41 100644 --- a/app/Module/UserWelcomeModule.php +++ b/app/Module/UserWelcomeModule.php @@ -21,10 +21,10 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; -use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Http\RequestHandlers\AccountEdit; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Tree; use Illuminate\Support\Str; @@ -76,10 +76,10 @@ class UserWelcomeModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/WelcomeBlockModule.php b/app/Module/WelcomeBlockModule.php index 3419cbd7cf..2700e12e54 100644 --- a/app/Module/WelcomeBlockModule.php +++ b/app/Module/WelcomeBlockModule.php @@ -74,10 +74,10 @@ class WelcomeBlockModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Module/YahrzeitModule.php b/app/Module/YahrzeitModule.php index 8af5ba5fbd..a50c31e586 100644 --- a/app/Module/YahrzeitModule.php +++ b/app/Module/YahrzeitModule.php @@ -80,10 +80,10 @@ class YahrzeitModule extends AbstractModule implements ModuleBlockInterface /** * Generate the HTML content of this block. * - * @param Tree $tree - * @param int $block_id - * @param string $context - * @param string[] $config + * @param Tree $tree + * @param int $block_id + * @param string $context + * @param array<string> $config * * @return string */ diff --git a/app/Report/AbstractRenderer.php b/app/Report/AbstractRenderer.php index 5256bed366..588aaa4ca0 100644 --- a/app/Report/AbstractRenderer.php +++ b/app/Report/AbstractRenderer.php @@ -380,7 +380,7 @@ abstract class AbstractRenderer /** * Add Style to Styles array * - * @param string[] $style + * @param array<string> $style * * @return void */ diff --git a/app/Report/ReportParserBase.php b/app/Report/ReportParserBase.php index 3315bdadf9..735af3f767 100644 --- a/app/Report/ReportParserBase.php +++ b/app/Report/ReportParserBase.php @@ -103,9 +103,9 @@ class ReportParserBase /** * XML handler for an opening (or self-closing) tag. * - * @param resource $parser The resource handler for the xml parser - * @param string $name The name of the xml element parsed - * @param string[] $attrs An array of key value pairs for the attributes + * @param resource $parser The resource handler for the xml parser + * @param string $name The name of the xml element parsed + * @param array<string> $attrs An array of key value pairs for the attributes * * @return void */ diff --git a/app/Report/ReportParserGenerate.php b/app/Report/ReportParserGenerate.php index 66be835455..190dac1d82 100644 --- a/app/Report/ReportParserGenerate.php +++ b/app/Report/ReportParserGenerate.php @@ -121,14 +121,14 @@ class ReportParserGenerate extends ReportParserBase /** @var int Quantity of data to repeat during loops */ private $repeat_bytes = 0; - /** @var string[] Repeated data when iterating over loops */ - private $repeats = []; + /** @var array<string> Repeated data when iterating over loops */ + private array $repeats = []; - /** @var array[] Nested repeating data */ - private $repeats_stack = []; + /** @var array<int,array<int,array<string>|int>> Nested repeating data */ + private array $repeats_stack = []; - /** @var AbstractRenderer[] Nested repeating data */ - private $wt_report_stack = []; + /** @var array<AbstractRenderer> Nested repeating data */ + private array $wt_report_stack = []; /** @var XMLParser (resource before PHP 8.0) Nested repeating data */ private $parser; @@ -139,7 +139,7 @@ class ReportParserGenerate extends ReportParserBase /** @var string The current GEDCOM record */ private $gedrec = ''; - /** @var string[] Nested GEDCOM records */ + /** @var array<string> Nested GEDCOM records */ private array $gedrec_stack = []; /** @var ReportBaseElement The currently processed element */ @@ -178,7 +178,7 @@ class ReportParserGenerate extends ReportParserBase /** @var AbstractRenderer Nested report elements */ private $wt_report; - /** @var string[][] Variables defined in the report at run-time */ + /** @var array<array<string>> Variables defined in the report at run-time */ private array $vars; private Tree $tree; @@ -188,11 +188,11 @@ class ReportParserGenerate extends ReportParserBase /** * Create a parser for a report * - * @param string $report The XML filename - * @param AbstractRenderer $report_root - * @param string[][] $vars - * @param Tree $tree - * @param FilesystemOperator $data_filesystem + * @param string $report The XML filename + * @param AbstractRenderer $report_root + * @param array<array<string>> $vars + * @param Tree $tree + * @param FilesystemOperator $data_filesystem */ public function __construct( string $report, @@ -217,9 +217,9 @@ class ReportParserGenerate extends ReportParserBase * This function is called whenever a starting element is reached * The element handler will be called if found, otherwise it must be HTML * - * @param resource $parser the resource handler for the XML parser - * @param string $name the name of the XML element parsed - * @param string[] $attrs an array of key value pairs for the attributes + * @param resource $parser the resource handler for the XML parser + * @param string $name the name of the XML element parsed + * @param array<string> $attrs an array of key value pairs for the attributes * * @return void */ @@ -284,7 +284,7 @@ class ReportParserGenerate extends ReportParserBase /** * Handle <style> * - * @param string[] $attrs + * @param array<string> $attrs * * @return void */ @@ -326,7 +326,7 @@ class ReportParserGenerate extends ReportParserBase * Handle <doc> * Sets up the basics of the document proparties * - * @param string[] $attrs + * @param array<string> $attrs * * @return void */ @@ -623,7 +623,7 @@ class ReportParserGenerate extends ReportParserBase /** * Called at the start of an element. * - * @param string[] $attrs an array of key value pairs for the attributes + * @param array<string> $attrs an array of key value pairs for the attributes * * @return void */ @@ -702,7 +702,7 @@ class ReportParserGenerate extends ReportParserBase /** * Handle <textBox> * - * @param string[] $attrs + * @param array<string> $attrs * * @return void */ @@ -848,7 +848,7 @@ class ReportParserGenerate extends ReportParserBase /** * XLM <Text>. * - * @param string[] $attrs an array of key value pairs for the attributes + * @param array<string> $attrs an array of key value pairs for the attributes * * @return void */ @@ -889,7 +889,7 @@ class ReportParserGenerate extends ReportParserBase * 1. id is empty - current GEDCOM record * 2. id is set with a record id * - * @param string[] $attrs an array of key value pairs for the attributes + * @param array<string> $attrs an array of key value pairs for the attributes * * @return void */ @@ -944,7 +944,7 @@ class ReportParserGenerate extends ReportParserBase /** * Handle <gedcomValue /> * - * @param string[] $attrs + * @param array<string> $attrs * * @return void */ @@ -1023,7 +1023,7 @@ class ReportParserGenerate extends ReportParserBase /** * Handle <repeatTag> * - * @param string[] $attrs + * @param array<string> $attrs * * @return void */ @@ -1186,7 +1186,7 @@ class ReportParserGenerate extends ReportParserBase * $ I18N::translate('....') * $ language_settings[] * - * @param string[] $attrs an array of key value pairs for the attributes + * @param array<string> $attrs an array of key value pairs for the attributes * * @return void */ @@ -1241,7 +1241,7 @@ class ReportParserGenerate extends ReportParserBase /** * Handle <facts> * - * @param string[] $attrs + * @param array<string> $attrs * * @return void */ @@ -1390,7 +1390,7 @@ class ReportParserGenerate extends ReportParserBase * Setting upp or changing variables in the XML * The XML variable name and value is stored in $this->vars * - * @param string[] $attrs an array of key value pairs for the attributes + * @param array<string> $attrs an array of key value pairs for the attributes * * @return void */ @@ -1457,7 +1457,7 @@ class ReportParserGenerate extends ReportParserBase /** * Handle <if> * - * @param string[] $attrs + * @param array<string> $attrs * * @return void */ @@ -1542,7 +1542,7 @@ class ReportParserGenerate extends ReportParserBase * Collect the Footnote links * GEDCOM Records that are protected by Privacy setting will be ignored * - * @param string[] $attrs + * @param array<string> $attrs * * @return void */ @@ -1627,7 +1627,7 @@ class ReportParserGenerate extends ReportParserBase /** * Handle <highlightedImage /> * - * @param string[] $attrs + * @param array<string> $attrs * * @return void */ @@ -1679,7 +1679,7 @@ class ReportParserGenerate extends ReportParserBase /** * Handle <image/> * - * @param string[] $attrs + * @param array<string> $attrs * * @return void */ @@ -1749,7 +1749,7 @@ class ReportParserGenerate extends ReportParserBase /** * Handle <line> * - * @param string[] $attrs + * @param array<string> $attrs * * @return void */ @@ -1807,7 +1807,7 @@ class ReportParserGenerate extends ReportParserBase /** * Handle <list> * - * @param string[] $attrs + * @param array<string> $attrs * * @return void */ @@ -2321,7 +2321,7 @@ class ReportParserGenerate extends ReportParserBase /** * Handle <relatives> * - * @param string[] $attrs + * @param array<string> $attrs * * @return void */ @@ -2572,10 +2572,10 @@ class ReportParserGenerate extends ReportParserBase /** * Create a list of all descendants. * - * @param string[] $list - * @param string $pid - * @param bool $parents - * @param int $generations + * @param array<string> $list + * @param string $pid + * @param bool $parents + * @param int $generations * * @return void */ diff --git a/app/Report/ReportParserSetup.php b/app/Report/ReportParserSetup.php index 66b77b7549..e5ce9535cf 100644 --- a/app/Report/ReportParserSetup.php +++ b/app/Report/ReportParserSetup.php @@ -49,7 +49,7 @@ class ReportParserSetup extends ReportParserBase /** * Handle <var var="" /> * - * @param string[] $attrs + * @param array<string> $attrs * * @return void */ @@ -103,7 +103,7 @@ class ReportParserSetup extends ReportParserBase /** * Handle <input> * - * @param string[] $attrs + * @param array<string> $attrs * * @return void */ diff --git a/app/Services/CalendarService.php b/app/Services/CalendarService.php index 4975d68daf..7dc5ed63df 100644 --- a/app/Services/CalendarService.php +++ b/app/Services/CalendarService.php @@ -101,7 +101,7 @@ class CalendarService * @param string $filterof filter by living/recent * @param string $filtersx filter by sex * - * @return Fact[] + * @return array<Fact> */ public function getCalendarEvents(int $jd1, int $jd2, string $facts, Tree $tree, string $filterof = '', string $filtersx = ''): array { @@ -267,7 +267,7 @@ class CalendarService * @param string $filterof filter by living/recent * @param string $filtersx filter by sex * - * @return Fact[] + * @return array<Fact> */ public function getAnniversaryEvents(int $jd, string $facts, Tree $tree, string $filterof = '', string $filtersx = ''): array { diff --git a/app/Services/DatatablesService.php b/app/Services/DatatablesService.php index ad7d30a088..eaabdcb499 100644 --- a/app/Services/DatatablesService.php +++ b/app/Services/DatatablesService.php @@ -39,11 +39,11 @@ class DatatablesService /** * Apply filtering and pagination to a collection, and generate a response suitable for datatables. * - * @param ServerRequestInterface $request Includes the datatables request parameters. - * @param Collection<mixed> $collection All the data. - * @param string[]|int[] $search_columns The names of searchable columns. - * @param string[]|int[] $sort_columns Sort column mapping. - * @param Closure $callback Converts a row-object to an array-of-columns. + * @param ServerRequestInterface $request Includes the datatables request parameters. + * @param Collection<mixed> $collection All the data. + * @param array<string>|array<int> $search_columns The names of searchable columns. + * @param array<string>|array<int> $sort_columns Sort column mapping. + * @param Closure $callback Converts a row-object to an array-of-columns. * * @return ResponseInterface */ @@ -119,8 +119,8 @@ class DatatablesService * * @param ServerRequestInterface $request Includes the datatables request parameters. * @param Builder $query A query to fetch the unfiltered rows and columns. - * @param string[] $search_columns The names of searchable columns. - * @param string[] $sort_columns Sort column mapping. + * @param array<string> $search_columns The names of searchable columns. + * @param array<string> $sort_columns Sort column mapping. * @param Closure $callback Converts a row-object to an array-of-columns. * * @return ResponseInterface diff --git a/app/Services/GedcomEditService.php b/app/Services/GedcomEditService.php index a61c443dde..e01a948d54 100644 --- a/app/Services/GedcomEditService.php +++ b/app/Services/GedcomEditService.php @@ -54,41 +54,41 @@ use const PHP_INT_MAX; */ class GedcomEditService { - /** @var string[] */ - public $glevels = []; + /** @var array<string> */ + public array $glevels = []; - /** @var string[] */ - public $tag = []; + /** @var array<string> */ + public array $tag = []; - /** @var string[] */ - public $islink = []; + /** @var array<string> */ + public array $islink = []; - /** @var string[] */ - public $text = []; + /** @var array<string> */ + public array $text = []; - /** @var string[] */ - protected $glevelsSOUR = []; + /** @var array<string> */ + protected array $glevelsSOUR = []; - /** @var string[] */ - protected $tagSOUR = []; + /** @var array<string> */ + protected array $tagSOUR = []; - /** @var string[] */ - protected $islinkSOUR = []; + /** @var array<string> */ + protected array $islinkSOUR = []; - /** @var string[] */ - protected $textSOUR = []; + /** @var array<string> */ + protected array $textSOUR = []; - /** @var string[] */ - protected $glevelsRest = []; + /** @var array<string> */ + protected array $glevelsRest = []; - /** @var string[] */ - protected $tagRest = []; + /** @var array<string> */ + protected array $tagRest = []; - /** @var string[] */ - protected $islinkRest = []; + /** @var array<string> */ + protected array $islinkRest = []; - /** @var string[] */ - protected $textRest = []; + /** @var array<string> */ + protected array $textRest = []; /** * This function splits the $glevels, $tag, $islink, and $text arrays so that the diff --git a/app/Services/MessageService.php b/app/Services/MessageService.php index fab15f1ed6..69d04d1cdf 100644 --- a/app/Services/MessageService.php +++ b/app/Services/MessageService.php @@ -59,7 +59,7 @@ class MessageService * * @param Tree $tree * - * @return UserInterface[] + * @return array<UserInterface> */ public function validContacts(Tree $tree): array { diff --git a/app/Services/PendingChangesService.php b/app/Services/PendingChangesService.php index 390f541890..1d4ef2f3d4 100644 --- a/app/Services/PendingChangesService.php +++ b/app/Services/PendingChangesService.php @@ -260,7 +260,7 @@ class PendingChangesService /** * Generate a query for filtering the changes log. * - * @param string[] $params + * @param array<string> $params * * @return Builder */ diff --git a/app/Services/SearchService.php b/app/Services/SearchService.php index 4b3e0c228d..b4efdfa978 100644 --- a/app/Services/SearchService.php +++ b/app/Services/SearchService.php @@ -82,8 +82,8 @@ class SearchService } /** - * @param Tree[] $trees - * @param string[] $search + * @param array<Tree> $trees + * @param array<string> $search * * @return Collection<Family> */ @@ -105,10 +105,10 @@ class SearchService /** * Search for families by name. * - * @param Tree[] $trees - * @param string[] $search - * @param int $offset - * @param int $limit + * @param array<Tree> $trees + * @param array<string> $search + * @param int $offset + * @param int $limit * * @return Collection<Family> */ @@ -165,8 +165,8 @@ class SearchService } /** - * @param Tree[] $trees - * @param string[] $search + * @param array<Tree> $trees + * @param array<string> $search * * @return Collection<Individual> */ @@ -188,10 +188,10 @@ class SearchService /** * Search for individuals by name. * - * @param Tree[] $trees - * @param string[] $search - * @param int $offset - * @param int $limit + * @param array<Tree> $trees + * @param array<string> $search + * @param int $offset + * @param int $limit * * @return Collection<Individual> */ @@ -237,10 +237,10 @@ class SearchService /** * Search for submissions. * - * @param Tree[] $trees - * @param string[] $search - * @param int $offset - * @param int $limit + * @param array<Tree> $trees + * @param array<string> $search + * @param int $offset + * @param int $limit * * @return Collection<Location> */ @@ -258,10 +258,10 @@ class SearchService /** * Search for media objects. * - * @param Tree[] $trees - * @param string[] $search - * @param int $offset - * @param int $limit + * @param array<Tree> $trees + * @param array<string> $search + * @param int $offset + * @param int $limit * * @return Collection<Media> */ @@ -278,10 +278,10 @@ class SearchService /** * Search for notes. * - * @param Tree[] $trees - * @param string[] $search - * @param int $offset - * @param int $limit + * @param array<Tree> $trees + * @param array<string> $search + * @param int $offset + * @param int $limit * * @return Collection<Note> */ @@ -299,10 +299,10 @@ class SearchService /** * Search for repositories. * - * @param Tree[] $trees - * @param string[] $search - * @param int $offset - * @param int $limit + * @param array<Tree> $trees + * @param array<string> $search + * @param int $offset + * @param int $limit * * @return Collection<Repository> */ @@ -320,8 +320,8 @@ class SearchService /** * Search for sources. * - * @param Tree[] $trees - * @param string[] $search + * @param array<Tree> $trees + * @param array<string> $search * @param int $offset * @param int $limit * @@ -340,10 +340,10 @@ class SearchService /** * Search for sources by name. * - * @param Tree[] $trees - * @param string[] $search - * @param int $offset - * @param int $limit + * @param array<Tree> $trees + * @param array<string> $search + * @param int $offset + * @param int $limit * * @return Collection<Source> */ @@ -361,10 +361,10 @@ class SearchService /** * Search for sources. * - * @param Tree[] $trees - * @param string[] $search - * @param int $offset - * @param int $limit + * @param array<Tree> $trees + * @param array<string> $search + * @param int $offset + * @param int $limit * * @return Collection<string> */ @@ -386,10 +386,10 @@ class SearchService /** * Search for submissions. * - * @param Tree[] $trees - * @param string[] $search - * @param int $offset - * @param int $limit + * @param array<Tree> $trees + * @param array<string> $search + * @param int $offset + * @param int $limit * * @return Collection<Submission> */ @@ -407,10 +407,10 @@ class SearchService /** * Search for submitters. * - * @param Tree[] $trees - * @param string[] $search - * @param int $offset - * @param int $limit + * @param array<Tree> $trees + * @param array<string> $search + * @param int $offset + * @param int $limit * * @return Collection<Submitter> */ @@ -487,9 +487,9 @@ class SearchService } /** - * @param Tree[] $trees - * @param string[] $fields - * @param string[] $modifiers + * @param array<Tree> $trees + * @param array<string> $fields + * @param array<string> $modifiers * * @return Collection<Individual> */ @@ -927,11 +927,11 @@ class SearchService } /** - * @param string $soundex - * @param string $lastname - * @param string $firstname - * @param string $place - * @param Tree[] $search_trees + * @param string $soundex + * @param string $lastname + * @param string $firstname + * @param string $place + * @param array<Tree> $search_trees * * @return Collection<Individual> */ @@ -1050,7 +1050,7 @@ class SearchService * * @param Builder $query * @param Expression|string $field - * @param string[] $search_terms + * @param array<string> $search_terms */ private function whereSearch(Builder $query, $field, array $search_terms): void { @@ -1082,9 +1082,9 @@ class SearchService } /** - * @param Builder $query - * @param string $tree_id_field - * @param Tree[] $trees + * @param Builder $query + * @param string $tree_id_field + * @param array<Tree> $trees */ private function whereTrees(Builder $query, string $tree_id_field, array $trees): void { @@ -1100,7 +1100,7 @@ class SearchService * * @param string $file * - * @return Media[] + * @return array<Media> */ public function findMediaObjectsForMediaFile(string $file): array { diff --git a/app/Services/SiteLogsService.php b/app/Services/SiteLogsService.php index 3a0532a09c..16c91dc0d8 100644 --- a/app/Services/SiteLogsService.php +++ b/app/Services/SiteLogsService.php @@ -34,7 +34,7 @@ class SiteLogsService /** * Generate a query for filtering the changes log. * - * @param string[] $params + * @param array<string> $params * * @return Builder */ diff --git a/app/Statistics.php b/app/Statistics.php index 8f90d02efc..684ba6887a 100644 --- a/app/Statistics.php +++ b/app/Statistics.php @@ -459,7 +459,7 @@ class Statistics implements } /** - * @param string[] ...$params + * @param array<string> ...$params * * @return string */ @@ -469,7 +469,7 @@ class Statistics implements } /** - * @param string[] ...$params + * @param array<string> ...$params * * @return string */ @@ -479,7 +479,7 @@ class Statistics implements } /** - * @param string[] $events + * @param array<string> $events * * @return string */ diff --git a/app/Statistics/Google/ChartDistribution.php b/app/Statistics/Google/ChartDistribution.php index b63661b61b..0edc5f585b 100644 --- a/app/Statistics/Google/ChartDistribution.php +++ b/app/Statistics/Google/ChartDistribution.php @@ -64,9 +64,9 @@ class ChartDistribution private $placeRepository; /** - * @var string[] + * @var array<string> */ - private $country_to_iso3166; + private array $country_to_iso3166; /** * Constructor. @@ -264,7 +264,6 @@ class ChartDistribution $records = $this->queryRecords($surname); foreach ($records as $row) { - /** @var string[][] $matches */ if (preg_match_all('/^2 PLAC (?:.*, *)*(.*)/m', $row->i_gedcom, $matches)) { // webtrees uses 3 letter country codes and localised country names, // but google uses 2 letter codes. diff --git a/app/Statistics/Repository/EventRepository.php b/app/Statistics/Repository/EventRepository.php index 2b6be5eede..1756d15559 100644 --- a/app/Statistics/Repository/EventRepository.php +++ b/app/Statistics/Repository/EventRepository.php @@ -105,7 +105,7 @@ class EventRepository implements EventRepositoryInterface } /** - * @param string[] $events + * @param array<string> $events * * @return string */ diff --git a/app/Statistics/Repository/IndividualRepository.php b/app/Statistics/Repository/IndividualRepository.php index 3c13bbb6da..1c7eab58e5 100644 --- a/app/Statistics/Repository/IndividualRepository.php +++ b/app/Statistics/Repository/IndividualRepository.php @@ -80,7 +80,7 @@ class IndividualRepository implements IndividualRepositoryInterface * @param int $threshold * @param int $maxtoshow * - * @return string|int[] + * @return string|array<int> */ private function commonGivenQuery(string $sex, string $type, bool $show_tot, int $threshold, int $maxtoshow) { @@ -429,7 +429,7 @@ class IndividualRepository implements IndividualRepositoryInterface /** * Count the number of distinct given names (or the number of occurences of specific given names). * - * @param string[] ...$params + * @param array<string> ...$params * * @return string */ @@ -457,7 +457,7 @@ class IndividualRepository implements IndividualRepositoryInterface /** * Count the number of distinct surnames (or the number of occurrences of specific surnames). * - * @param string[] ...$params + * @param array<string> ...$params * * @return string */ @@ -484,7 +484,7 @@ class IndividualRepository implements IndividualRepositoryInterface * @param int $number_of_surnames * @param int $threshold * - * @return int[][] + * @return array<array<int>> */ private function topSurnames(int $number_of_surnames, int $threshold): array { diff --git a/app/Statistics/Repository/Interfaces/EventRepositoryInterface.php b/app/Statistics/Repository/Interfaces/EventRepositoryInterface.php index 87d3defb45..4974cccc0e 100644 --- a/app/Statistics/Repository/Interfaces/EventRepositoryInterface.php +++ b/app/Statistics/Repository/Interfaces/EventRepositoryInterface.php @@ -27,7 +27,7 @@ interface EventRepositoryInterface /** * Count the number of events (with dates). * - * @param string[] $events + * @param array<string> $events * * @return string */ diff --git a/app/Statistics/Repository/MediaRepository.php b/app/Statistics/Repository/MediaRepository.php index 4581aa58f2..2f12fc95c8 100644 --- a/app/Statistics/Repository/MediaRepository.php +++ b/app/Statistics/Repository/MediaRepository.php @@ -66,8 +66,6 @@ class MediaRepository implements MediaRepositoryInterface /** * List of GEDCOM media types. - * - * @var string[] */ private const MEDIA_TYPES = [ self::MEDIA_TYPE_AUDIO, diff --git a/app/Tree.php b/app/Tree.php index 1849369c3e..8e6b268421 100644 --- a/app/Tree.php +++ b/app/Tree.php @@ -118,10 +118,10 @@ class Tree /** @var integer[][] Default access rules for individual facts in this tree */ private $individual_fact_privacy; - /** @var string[] Cached copy of the wt_gedcom_setting table. */ + /** @var array<string> Cached copy of the wt_gedcom_setting table. */ private $preferences = []; - /** @var string[][] Cached copy of the wt_user_gedcom_setting table. */ + /** @var array<array<string>> Cached copy of the wt_user_gedcom_setting table. */ private $user_preferences = []; /** @@ -242,7 +242,7 @@ class Tree /** * The fact-level privacy for this tree. * - * @return int[] + * @return array<int> */ public function getFactPrivacy(): array { @@ -252,7 +252,7 @@ class Tree /** * The individual-level privacy for this tree. * - * @return int[] + * @return array<int> */ public function getIndividualPrivacy(): array { @@ -262,7 +262,7 @@ class Tree /** * The individual-fact-level privacy for this tree. * - * @return int[][] + * @return array<array<int>> */ public function getIndividualFactPrivacy(): array { diff --git a/app/Validator.php b/app/Validator.php index fad1bb5fb3..d8cb12a3dc 100644 --- a/app/Validator.php +++ b/app/Validator.php @@ -39,14 +39,14 @@ use function str_starts_with; */ class Validator { - /** @var array<string|array> */ + /** @var array<string|array<string>> */ private array $parameters; /** @var array<Closure> */ private array $rules = []; /** - * @param array<string|array> $parameters + * @param array<string|array<string>> $parameters */ public function __construct(array $parameters) { diff --git a/app/View.php b/app/View.php index bc0d2a8720..e49868d0af 100644 --- a/app/View.php +++ b/app/View.php @@ -62,14 +62,14 @@ class View private $data; /** - * @var string[] Where do the templates live, for each namespace. + * @var array<string> Where do the templates live, for each namespace. */ private static $namespaces = [ '' => Webtrees::ROOT_DIR . 'resources/views/', ]; /** - * @var string[] Modules can replace core views with their own. + * @var array<string> Modules can replace core views with their own. */ private static $replacements = []; @@ -272,8 +272,8 @@ class View /** * Create and render a view in a single operation. * - * @param string $name - * @param mixed[] $data + * @param string $name + * @param array<mixed> $data * * @return string */ diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 6f8651b94c..3cad574d53 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -950,11 +950,6 @@ parameters: path: app/Module/MinimalTheme.php - - message: "#^Method Fisharebest\\\\Webtrees\\\\Module\\\\ModuleBlockInterface\\:\\:getBlock\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#" - count: 1 - path: app/Module/ModuleBlockInterface.php - - - message: "#^Property Fisharebest\\\\Webtrees\\\\Module\\\\NotesTabModule\\:\\:\\$facts type has no value type specified in iterable type Illuminate\\\\Support\\\\Collection\\.$#" count: 1 path: app/Module/NotesTabModule.php @@ -1060,11 +1055,6 @@ parameters: path: app/Module/StatisticsChartModule.php - - message: "#^Method Fisharebest\\\\Webtrees\\\\Module\\\\TimelineChartModule\\:\\:chart\\(\\) has parameter \\$xrefs with no value type specified in iterable type array\\.$#" - count: 1 - path: app/Module/TimelineChartModule.php - - - message: "#^Parameter \\#1 \\$surnames of static method Fisharebest\\\\Webtrees\\\\Functions\\\\FunctionsPrintLists\\:\\:surnameTagCloud\\(\\) expects array\\<string, array\\<string, int\\>\\>, array\\<int\\|string, array\\> given\\.$#" count: 1 path: app/Module/TopSurnamesModule.php @@ -1215,11 +1205,6 @@ parameters: path: app/Report/ReportParserGenerate.php - - message: "#^Cannot access offset \\(float\\|int\\) on array\\<int, string\\>\\|false\\.$#" - count: 14 - path: app/Report/ReportParserGenerate.php - - - message: "#^Cannot access offset 0 on array\\|false\\.$#" count: 3 path: app/Report/ReportParserGenerate.php @@ -1230,6 +1215,11 @@ parameters: path: app/Report/ReportParserGenerate.php - + message: "#^Cannot access offset float\\|int on array\\<int, string\\>\\|false\\.$#" + count: 14 + path: app/Report/ReportParserGenerate.php + + - message: "#^Cannot access property \\$generation on Fisharebest\\\\Webtrees\\\\Individual\\|string\\.$#" count: 1 path: app/Report/ReportParserGenerate.php diff --git a/resources/views/admin/site-mail.phtml b/resources/views/admin/site-mail.phtml index d96d662f4e..71e3dc62a0 100644 --- a/resources/views/admin/site-mail.phtml +++ b/resources/views/admin/site-mail.phtml @@ -3,27 +3,26 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\EmailPreferencesAction; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\View; use Fisharebest\Webtrees\Webtrees; /** - * @var string $DKIM_DOMAIN - * @var string $DKIM_KEY - * @var string $DKIM_SELECTOR - * @var string $SMTP_ACTIVE - * @var string $SMTP_AUTH - * @var string $SMTP_AUTH_USER - * @var string $SMTP_DISP_NAME - * @var string $SMTP_FROM_NAME - * @var string $SMTP_HELO - * @var string $SMTP_HOST - * @var string $SMTP_PORT - * @var string $SMTP_SSL - * @var string[] $mail_ssl_options - * @var string[] $mail_transport_options - * @var bool $smtp_helo_valid - * @var bool $smtp_from_name_valid - * @var string $title + * @var string $DKIM_DOMAIN + * @var string $DKIM_KEY + * @var string $DKIM_SELECTOR + * @var string $SMTP_ACTIVE + * @var string $SMTP_AUTH + * @var string $SMTP_AUTH_USER + * @var string $SMTP_DISP_NAME + * @var string $SMTP_FROM_NAME + * @var string $SMTP_HELO + * @var string $SMTP_HOST + * @var string $SMTP_PORT + * @var string $SMTP_SSL + * @var array<string> $mail_ssl_options + * @var array<string> $mail_transport_options + * @var bool $smtp_helo_valid + * @var bool $smtp_from_name_valid + * @var string $title */ ?> diff --git a/resources/views/components/radios-inline.phtml b/resources/views/components/radios-inline.phtml index 297d6a1345..92ec855200 100644 --- a/resources/views/components/radios-inline.phtml +++ b/resources/views/components/radios-inline.phtml @@ -1,9 +1,9 @@ <?php /** - * @var string $name - * @var mixed $selected - * @var string[] $options + * @var string $name + * @var mixed $selected + * @var array<string> $options */ ?> diff --git a/resources/views/components/radios.phtml b/resources/views/components/radios.phtml index c363835e91..dadd3940ad 100644 --- a/resources/views/components/radios.phtml +++ b/resources/views/components/radios.phtml @@ -1,9 +1,9 @@ <?php /** - * @var string $name - * @var mixed $selected - * @var string[] $options + * @var string $name + * @var mixed $selected + * @var array<string> $options */ ?> diff --git a/resources/views/components/select-number.phtml b/resources/views/components/select-number.phtml index e3d3ad1880..dc58c75f76 100644 --- a/resources/views/components/select-number.phtml +++ b/resources/views/components/select-number.phtml @@ -1,11 +1,11 @@ <?php /** - * @var string|null $class - * @var string|null $id - * @var string $name - * @var mixed $selected - * @var string[] $options + * @var string|null $class + * @var string|null $id + * @var string $name + * @var mixed $selected + * @var array<string> $options */ use Fisharebest\Webtrees\I18N; diff --git a/resources/views/components/select.phtml b/resources/views/components/select.phtml index 1a506eb0e2..c4751a8f48 100644 --- a/resources/views/components/select.phtml +++ b/resources/views/components/select.phtml @@ -1,12 +1,12 @@ <?php /** - * @var string|null $class - * @var string|null $id - * @var string $name - * @var mixed $selected - * @var string[] $options - * @var string|null $aria_label + * @var string|null $class + * @var string|null $id + * @var string $name + * @var mixed $selected + * @var array<string> $options + * @var string|null $aria_label */ ?> diff --git a/resources/views/modules/pedigree-chart/chart-down.phtml b/resources/views/modules/pedigree-chart/chart-down.phtml index 3e324e941d..4827eed8c0 100644 --- a/resources/views/modules/pedigree-chart/chart-down.phtml +++ b/resources/views/modules/pedigree-chart/chart-down.phtml @@ -4,12 +4,12 @@ use Fisharebest\Webtrees\Individual; use Illuminate\Support\Collection; /** - * @var Collection|Individual[] $ancestors Indexed by sosa number - * @var int $generation Draw this generation - * @var int $generations Final generation to draw - * @var Collection|string[] $links Links to extend the tree - * @var int $sosa Draw this individual - * @var string $spacer + * @var Collection<Individual> $ancestors Indexed by sosa number + * @var int $generation Draw this generation + * @var int $generations Final generation to draw + * @var Collection<string> $links Links to extend the tree + * @var int $sosa Draw this individual + * @var string $spacer */ ?> diff --git a/resources/views/modules/pedigree-chart/chart-left.phtml b/resources/views/modules/pedigree-chart/chart-left.phtml index 9cabf637a1..d325b0be55 100644 --- a/resources/views/modules/pedigree-chart/chart-left.phtml +++ b/resources/views/modules/pedigree-chart/chart-left.phtml @@ -4,12 +4,12 @@ use Fisharebest\Webtrees\Individual; use Illuminate\Support\Collection; /** - * @var Collection|Individual[] $ancestors Indexed by sosa number - * @var int $generation Draw this generation - * @var int $generations Final generation to draw - * @var Collection|string[] $links Links to extend the tree - * @var int $sosa Draw this individual - * @var string $spacer + * @var Collection<Individual> $ancestors Indexed by sosa number + * @var int $generation Draw this generation + * @var int $generations Final generation to draw + * @var Collection<string> $links Links to extend the tree + * @var int $sosa Draw this individual + * @var string $spacer */ ?> diff --git a/resources/views/modules/pedigree-chart/chart-right.phtml b/resources/views/modules/pedigree-chart/chart-right.phtml index 713a1e40aa..9d8f712724 100644 --- a/resources/views/modules/pedigree-chart/chart-right.phtml +++ b/resources/views/modules/pedigree-chart/chart-right.phtml @@ -4,12 +4,12 @@ use Fisharebest\Webtrees\Individual; use Illuminate\Support\Collection; /** - * @var Collection|Individual[] $ancestors Indexed by sosa number - * @var int $generation Draw this generation - * @var int $generations Final generation to draw - * @var Collection|string[] $links Links to extend the tree - * @var int $sosa Draw this individual - * @var string $spacer + * @var Collection<Individual> $ancestors Indexed by sosa number + * @var int $generation Draw this generation + * @var int $generations Final generation to draw + * @var Collection<string> $links Links to extend the tree + * @var int $sosa Draw this individual + * @var string $spacer */ ?> diff --git a/resources/views/modules/pedigree-chart/chart.phtml b/resources/views/modules/pedigree-chart/chart.phtml index bba47a3378..0b61b9f916 100644 --- a/resources/views/modules/pedigree-chart/chart.phtml +++ b/resources/views/modules/pedigree-chart/chart.phtml @@ -4,11 +4,11 @@ use Fisharebest\Webtrees\Individual; use Illuminate\Support\Collection; /** - * @var Collection|Individual[] $ancestors - * @var int $generations - * @var Collection|string[] $links - * @var string $spacer - * @var string $style + * @var Collection<Individual> $ancestors + * @var int $generations + * @var Collection<string> $links + * @var string $spacer + * @var string $style */ ?> diff --git a/resources/views/modules/pedigree-chart/previous.phtml b/resources/views/modules/pedigree-chart/previous.phtml index 677b280df8..9c3d3f1fd0 100644 --- a/resources/views/modules/pedigree-chart/previous.phtml +++ b/resources/views/modules/pedigree-chart/previous.phtml @@ -3,10 +3,10 @@ use Fisharebest\Webtrees\I18N; /** - * @var string $icon - * @var string[] $siblings - * @var string[] $spouses - * @var string[] $children + * @var string $icon + * @var array<string> $siblings + * @var array<string> $spouses + * @var array<string> $children */ ?> diff --git a/resources/views/search-advanced-field.phtml b/resources/views/search-advanced-field.phtml index edcac53e9a..49fd6f0c82 100644 --- a/resources/views/search-advanced-field.phtml +++ b/resources/views/search-advanced-field.phtml @@ -1,12 +1,12 @@ <?php /** - * @var string[] $date_options - * @var string $field_label - * @var string $field_name - * @var string $field_value - * @var string $modifier - * @var string[] $name_options + * @var array<string> $date_options + * @var string $field_label + * @var string $field_name + * @var string $field_value + * @var string $modifier + * @var array<string> $name_options */ ?> diff --git a/tests/MockGlobalFunctions.php b/tests/MockGlobalFunctions.php index 2fd5564b7b..4ffd63ad53 100644 --- a/tests/MockGlobalFunctions.php +++ b/tests/MockGlobalFunctions.php @@ -29,7 +29,7 @@ abstract class MockGlobalFunctions * * @param bool $get_as_float * - * @return float|int[] + * @return float|array<int> */ abstract public function microtime(bool $get_as_float); diff --git a/tests/TestCase.php b/tests/TestCase.php index ea77eed6cd..0bd72d6d6e 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -139,11 +139,11 @@ class TestCase extends \PHPUnit\Framework\TestCase /** * Create a request and bind it into the container. * - * @param string $method - * @param string[] $query - * @param string[] $params - * @param UploadedFileInterface[] $files - * @param string[] $attributes + * @param string $method + * @param array<string> $query + * @param array<string> $params + * @param array<UploadedFileInterface> $files + * @param array<string> $attributes * * @return ServerRequestInterface */ diff --git a/tests/feature/RelationshipNamesTest.php b/tests/feature/RelationshipNamesTest.php index 63a809818d..1e242eda55 100644 --- a/tests/feature/RelationshipNamesTest.php +++ b/tests/feature/RelationshipNamesTest.php @@ -379,9 +379,9 @@ class RelationshipNamesTest extends TestCase } /** - * @param string $expected - * @param array $nodes - * @param ModuleLanguageInterface $language + * @param string $expected + * @param array<Individual|Family> $nodes + * @param ModuleLanguageInterface $language */ private static function assertRelationship(string $expected, array $nodes, ModuleLanguageInterface $language): void { @@ -397,10 +397,10 @@ class RelationshipNamesTest extends TestCase /** * Test a relationship name in both directions * - * @param string $fwd - * @param string $rev - * @param array $nodes - * @param ModuleLanguageInterface $language + * @param string $fwd + * @param string $rev + * @param array<Individual|Family> $nodes + * @param ModuleLanguageInterface $language */ private static function assertRelationships(string $fwd, string $rev, array $nodes, ModuleLanguageInterface $language): void { |