diff options
86 files changed, 22 insertions, 171 deletions
diff --git a/app/Census/AbstractCensusColumn.php b/app/Census/AbstractCensusColumn.php index 40d27e0522..f7b6071381 100644 --- a/app/Census/AbstractCensusColumn.php +++ b/app/Census/AbstractCensusColumn.php @@ -155,7 +155,7 @@ class AbstractCensusColumn { if (empty($families)) { return null; } else { - usort($families, function(Family $x, Family $y) { return Date::compare($x->getMarriageDate(), $y->getMarriageDate()); }); + usort($families, function (Family $x, Family $y) { return Date::compare($x->getMarriageDate(), $y->getMarriageDate()); }); return end($families); } diff --git a/app/Census/CensusColumnBirthPlace.php b/app/Census/CensusColumnBirthPlace.php index 2741a0ff10..743ccab97c 100644 --- a/app/Census/CensusColumnBirthPlace.php +++ b/app/Census/CensusColumnBirthPlace.php @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; diff --git a/app/Census/CensusColumnBirthPlaceSimple.php b/app/Census/CensusColumnBirthPlaceSimple.php index 6bfcc429fd..d9053f8152 100644 --- a/app/Census/CensusColumnBirthPlaceSimple.php +++ b/app/Census/CensusColumnBirthPlaceSimple.php @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; diff --git a/app/Census/CensusColumnBornForeignParts.php b/app/Census/CensusColumnBornForeignParts.php index 351843759a..2f73cb1e79 100644 --- a/app/Census/CensusColumnBornForeignParts.php +++ b/app/Census/CensusColumnBornForeignParts.php @@ -30,8 +30,8 @@ class CensusColumnBornForeignParts extends AbstractCensusColumn implements Censu * @return string */ public function generate(Individual $individual, Individual $head = null) { - $birth_place = explode(', ', $individual->getBirthPlace()); - $birth_place = end($birth_place); + $birth_place = explode(', ', $individual->getBirthPlace()); + $birth_place = end($birth_place); $census_place = $this->place(); if ($birth_place === 'Wales') { diff --git a/app/Census/CensusColumnFatherBirthPlaceSimple.php b/app/Census/CensusColumnFatherBirthPlaceSimple.php index a16587bd79..058fa49af6 100644 --- a/app/Census/CensusColumnFatherBirthPlaceSimple.php +++ b/app/Census/CensusColumnFatherBirthPlaceSimple.php @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; diff --git a/app/Census/CensusColumnMotherBirthPlaceSimple.php b/app/Census/CensusColumnMotherBirthPlaceSimple.php index e87ef3d802..4bc01b4d46 100644 --- a/app/Census/CensusColumnMotherBirthPlaceSimple.php +++ b/app/Census/CensusColumnMotherBirthPlaceSimple.php @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; diff --git a/app/Census/CensusOfDenmark1787.php b/app/Census/CensusOfDenmark1787.php index 68232e74d1..30a9181b43 100644 --- a/app/Census/CensusOfDenmark1787.php +++ b/app/Census/CensusOfDenmark1787.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1801.php b/app/Census/CensusOfDenmark1801.php index 02671022a9..d856d3e2fb 100644 --- a/app/Census/CensusOfDenmark1801.php +++ b/app/Census/CensusOfDenmark1801.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1803.php b/app/Census/CensusOfDenmark1803.php index e43b40ac98..6da108af71 100644 --- a/app/Census/CensusOfDenmark1803.php +++ b/app/Census/CensusOfDenmark1803.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1834.php b/app/Census/CensusOfDenmark1834.php index c747d4e0e2..4362b40289 100644 --- a/app/Census/CensusOfDenmark1834.php +++ b/app/Census/CensusOfDenmark1834.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1835.php b/app/Census/CensusOfDenmark1835.php index 47cc2072e2..e5a2a54eeb 100644 --- a/app/Census/CensusOfDenmark1835.php +++ b/app/Census/CensusOfDenmark1835.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1840.php b/app/Census/CensusOfDenmark1840.php index b6006f84be..ea374a372a 100644 --- a/app/Census/CensusOfDenmark1840.php +++ b/app/Census/CensusOfDenmark1840.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1845.php b/app/Census/CensusOfDenmark1845.php index b711fcbb69..ec6ad75a84 100644 --- a/app/Census/CensusOfDenmark1845.php +++ b/app/Census/CensusOfDenmark1845.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1850.php b/app/Census/CensusOfDenmark1850.php index 6678132262..0eed3fe77b 100644 --- a/app/Census/CensusOfDenmark1850.php +++ b/app/Census/CensusOfDenmark1850.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1855.php b/app/Census/CensusOfDenmark1855.php index 2a31349e95..87a144e0bc 100644 --- a/app/Census/CensusOfDenmark1855.php +++ b/app/Census/CensusOfDenmark1855.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1860.php b/app/Census/CensusOfDenmark1860.php index 1ffbeb9e0f..8e01ac2a04 100644 --- a/app/Census/CensusOfDenmark1860.php +++ b/app/Census/CensusOfDenmark1860.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1870.php b/app/Census/CensusOfDenmark1870.php index fefdd170e6..56df2df3db 100644 --- a/app/Census/CensusOfDenmark1870.php +++ b/app/Census/CensusOfDenmark1870.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1880.php b/app/Census/CensusOfDenmark1880.php index f36ee99db8..feb6f3eee9 100644 --- a/app/Census/CensusOfDenmark1880.php +++ b/app/Census/CensusOfDenmark1880.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1885.php b/app/Census/CensusOfDenmark1885.php index 68b17b14e6..95a7c55021 100644 --- a/app/Census/CensusOfDenmark1885.php +++ b/app/Census/CensusOfDenmark1885.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1890.php b/app/Census/CensusOfDenmark1890.php index 902b7f9d13..f6b0dbf62d 100644 --- a/app/Census/CensusOfDenmark1890.php +++ b/app/Census/CensusOfDenmark1890.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1895.php b/app/Census/CensusOfDenmark1895.php index 69ada788bc..f1063a8805 100644 --- a/app/Census/CensusOfDenmark1895.php +++ b/app/Census/CensusOfDenmark1895.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1901.php b/app/Census/CensusOfDenmark1901.php index 0b755cf83f..e96369d29b 100644 --- a/app/Census/CensusOfDenmark1901.php +++ b/app/Census/CensusOfDenmark1901.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1906.php b/app/Census/CensusOfDenmark1906.php index 86c4d77930..186c87b5ce 100644 --- a/app/Census/CensusOfDenmark1906.php +++ b/app/Census/CensusOfDenmark1906.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1911.php b/app/Census/CensusOfDenmark1911.php index 07e658de14..af9ac853f2 100644 --- a/app/Census/CensusOfDenmark1911.php +++ b/app/Census/CensusOfDenmark1911.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1916.php b/app/Census/CensusOfDenmark1916.php index 435809daf8..317814e12c 100644 --- a/app/Census/CensusOfDenmark1916.php +++ b/app/Census/CensusOfDenmark1916.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1921.php b/app/Census/CensusOfDenmark1921.php index 883b757d7b..58d9273486 100644 --- a/app/Census/CensusOfDenmark1921.php +++ b/app/Census/CensusOfDenmark1921.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1925.php b/app/Census/CensusOfDenmark1925.php index cb6d2cf0e5..ed78492fcc 100644 --- a/app/Census/CensusOfDenmark1925.php +++ b/app/Census/CensusOfDenmark1925.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1930.php b/app/Census/CensusOfDenmark1930.php index bb83a11b80..f8f33dcddc 100644 --- a/app/Census/CensusOfDenmark1930.php +++ b/app/Census/CensusOfDenmark1930.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1940.php b/app/Census/CensusOfDenmark1940.php index ef6be88522..da822b9306 100644 --- a/app/Census/CensusOfDenmark1940.php +++ b/app/Census/CensusOfDenmark1940.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfDenmark1950.php b/app/Census/CensusOfDenmark1950.php index c8fe32bdfe..eb666bf9f3 100644 --- a/app/Census/CensusOfDenmark1950.php +++ b/app/Census/CensusOfDenmark1950.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfEngland1841.php b/app/Census/CensusOfEngland1841.php index c1bb8e1422..ddf7d79cb9 100644 --- a/app/Census/CensusOfEngland1841.php +++ b/app/Census/CensusOfEngland1841.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfEngland1851.php b/app/Census/CensusOfEngland1851.php index b48944dde2..6e4a3044f4 100644 --- a/app/Census/CensusOfEngland1851.php +++ b/app/Census/CensusOfEngland1851.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfEngland1861.php b/app/Census/CensusOfEngland1861.php index 198542776a..72d7915e41 100644 --- a/app/Census/CensusOfEngland1861.php +++ b/app/Census/CensusOfEngland1861.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfEngland1871.php b/app/Census/CensusOfEngland1871.php index 69cf4484b6..e650910d10 100644 --- a/app/Census/CensusOfEngland1871.php +++ b/app/Census/CensusOfEngland1871.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfEngland1881.php b/app/Census/CensusOfEngland1881.php index 9fe23e9c53..784d070382 100644 --- a/app/Census/CensusOfEngland1881.php +++ b/app/Census/CensusOfEngland1881.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfEngland1891.php b/app/Census/CensusOfEngland1891.php index 840a205ff0..42a88b6867 100644 --- a/app/Census/CensusOfEngland1891.php +++ b/app/Census/CensusOfEngland1891.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfEngland1901.php b/app/Census/CensusOfEngland1901.php index 7ef8a60a38..0a0b2480f7 100644 --- a/app/Census/CensusOfEngland1901.php +++ b/app/Census/CensusOfEngland1901.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfFrance1836.php b/app/Census/CensusOfFrance1836.php index 8adbc167f4..95fa2ad5e4 100644 --- a/app/Census/CensusOfFrance1836.php +++ b/app/Census/CensusOfFrance1836.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfFrance1841.php b/app/Census/CensusOfFrance1841.php index 56f91f3957..1a0f2372a1 100644 --- a/app/Census/CensusOfFrance1841.php +++ b/app/Census/CensusOfFrance1841.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfFrance1846.php b/app/Census/CensusOfFrance1846.php index a2a2f8e80e..a20aa7469b 100644 --- a/app/Census/CensusOfFrance1846.php +++ b/app/Census/CensusOfFrance1846.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfFrance1851.php b/app/Census/CensusOfFrance1851.php index cde00b1e43..4f997f48c6 100644 --- a/app/Census/CensusOfFrance1851.php +++ b/app/Census/CensusOfFrance1851.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfFrance1856.php b/app/Census/CensusOfFrance1856.php index d2e028c0b2..9ab81c5e54 100644 --- a/app/Census/CensusOfFrance1856.php +++ b/app/Census/CensusOfFrance1856.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfFrance1861.php b/app/Census/CensusOfFrance1861.php index a53270e67e..6b7714b0cd 100644 --- a/app/Census/CensusOfFrance1861.php +++ b/app/Census/CensusOfFrance1861.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfFrance1866.php b/app/Census/CensusOfFrance1866.php index c404aca2a6..936cd54c2c 100644 --- a/app/Census/CensusOfFrance1866.php +++ b/app/Census/CensusOfFrance1866.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfFrance1872.php b/app/Census/CensusOfFrance1872.php index 354c0b4fd6..2fb7fb39d8 100644 --- a/app/Census/CensusOfFrance1872.php +++ b/app/Census/CensusOfFrance1872.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfFrance1876.php b/app/Census/CensusOfFrance1876.php index e6b88b72a8..b4f7093e54 100644 --- a/app/Census/CensusOfFrance1876.php +++ b/app/Census/CensusOfFrance1876.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfFrance1881.php b/app/Census/CensusOfFrance1881.php index 1baa4f19b7..0cb8675f82 100644 --- a/app/Census/CensusOfFrance1881.php +++ b/app/Census/CensusOfFrance1881.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfFrance1886.php b/app/Census/CensusOfFrance1886.php index d2e9307835..97b3035070 100644 --- a/app/Census/CensusOfFrance1886.php +++ b/app/Census/CensusOfFrance1886.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfFrance1891.php b/app/Census/CensusOfFrance1891.php index cb59c40dc5..dcdbf8b78d 100644 --- a/app/Census/CensusOfFrance1891.php +++ b/app/Census/CensusOfFrance1891.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfFrance1896.php b/app/Census/CensusOfFrance1896.php index e53a5464cf..e3a4b33d28 100644 --- a/app/Census/CensusOfFrance1896.php +++ b/app/Census/CensusOfFrance1896.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfFrance1901.php b/app/Census/CensusOfFrance1901.php index f1b50f2510..6598ae7b6a 100644 --- a/app/Census/CensusOfFrance1901.php +++ b/app/Census/CensusOfFrance1901.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfFrance1906.php b/app/Census/CensusOfFrance1906.php index 2e987ee1be..640f9985e0 100644 --- a/app/Census/CensusOfFrance1906.php +++ b/app/Census/CensusOfFrance1906.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfFrance1911.php b/app/Census/CensusOfFrance1911.php index c403a9474b..26f3ff52d3 100644 --- a/app/Census/CensusOfFrance1911.php +++ b/app/Census/CensusOfFrance1911.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfScotland1841.php b/app/Census/CensusOfScotland1841.php index 459919a20d..cc5ece1da0 100644 --- a/app/Census/CensusOfScotland1841.php +++ b/app/Census/CensusOfScotland1841.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfScotland1851.php b/app/Census/CensusOfScotland1851.php index fbd07fe2af..e9e8ac4dd7 100644 --- a/app/Census/CensusOfScotland1851.php +++ b/app/Census/CensusOfScotland1851.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfScotland1861.php b/app/Census/CensusOfScotland1861.php index 5f44f3438c..8af866a3be 100644 --- a/app/Census/CensusOfScotland1861.php +++ b/app/Census/CensusOfScotland1861.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfScotland1871.php b/app/Census/CensusOfScotland1871.php index 829319fbeb..542207ec55 100644 --- a/app/Census/CensusOfScotland1871.php +++ b/app/Census/CensusOfScotland1871.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfScotland1881.php b/app/Census/CensusOfScotland1881.php index 4de763f555..b1cb15235e 100644 --- a/app/Census/CensusOfScotland1881.php +++ b/app/Census/CensusOfScotland1881.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfScotland1891.php b/app/Census/CensusOfScotland1891.php index f3f90a0a0b..9778052d89 100644 --- a/app/Census/CensusOfScotland1891.php +++ b/app/Census/CensusOfScotland1891.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfScotland1901.php b/app/Census/CensusOfScotland1901.php index 20801b7d06..9b90fd4e50 100644 --- a/app/Census/CensusOfScotland1901.php +++ b/app/Census/CensusOfScotland1901.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfScotland1911.php b/app/Census/CensusOfScotland1911.php index 69177094f0..feb9a191e5 100644 --- a/app/Census/CensusOfScotland1911.php +++ b/app/Census/CensusOfScotland1911.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfUnitedStates1850.php b/app/Census/CensusOfUnitedStates1850.php index f19977a6b5..0e860e6d57 100644 --- a/app/Census/CensusOfUnitedStates1850.php +++ b/app/Census/CensusOfUnitedStates1850.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfUnitedStates1860.php b/app/Census/CensusOfUnitedStates1860.php index 0fd062c4fd..403495bbd9 100644 --- a/app/Census/CensusOfUnitedStates1860.php +++ b/app/Census/CensusOfUnitedStates1860.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfUnitedStates1870.php b/app/Census/CensusOfUnitedStates1870.php index b41fb6a671..dfe1df29fe 100644 --- a/app/Census/CensusOfUnitedStates1870.php +++ b/app/Census/CensusOfUnitedStates1870.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfUnitedStates1880.php b/app/Census/CensusOfUnitedStates1880.php index 6d11ba49c4..acdb055399 100644 --- a/app/Census/CensusOfUnitedStates1880.php +++ b/app/Census/CensusOfUnitedStates1880.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfUnitedStates1890.php b/app/Census/CensusOfUnitedStates1890.php index 3b8a3f2632..532d1f1fee 100644 --- a/app/Census/CensusOfUnitedStates1890.php +++ b/app/Census/CensusOfUnitedStates1890.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfUnitedStates1900.php b/app/Census/CensusOfUnitedStates1900.php index d804556f1d..beef1e841e 100644 --- a/app/Census/CensusOfUnitedStates1900.php +++ b/app/Census/CensusOfUnitedStates1900.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfUnitedStates1910.php b/app/Census/CensusOfUnitedStates1910.php index 2f9f43a856..4a1d100f31 100644 --- a/app/Census/CensusOfUnitedStates1910.php +++ b/app/Census/CensusOfUnitedStates1910.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfUnitedStates1920.php b/app/Census/CensusOfUnitedStates1920.php index d0c7a4bfda..45e3750743 100644 --- a/app/Census/CensusOfUnitedStates1920.php +++ b/app/Census/CensusOfUnitedStates1920.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfUnitedStates1930.php b/app/Census/CensusOfUnitedStates1930.php index 19bf521bca..b1467e2938 100644 --- a/app/Census/CensusOfUnitedStates1930.php +++ b/app/Census/CensusOfUnitedStates1930.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfUnitedStates1940.php b/app/Census/CensusOfUnitedStates1940.php index b15a84300d..a6a259590b 100644 --- a/app/Census/CensusOfUnitedStates1940.php +++ b/app/Census/CensusOfUnitedStates1940.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfWales1841.php b/app/Census/CensusOfWales1841.php index 829905eea2..c5589060cf 100644 --- a/app/Census/CensusOfWales1841.php +++ b/app/Census/CensusOfWales1841.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfWales1851.php b/app/Census/CensusOfWales1851.php index 0225e598c0..2425f57390 100644 --- a/app/Census/CensusOfWales1851.php +++ b/app/Census/CensusOfWales1851.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfWales1861.php b/app/Census/CensusOfWales1861.php index 2b0cbd897d..12ba7e2861 100644 --- a/app/Census/CensusOfWales1861.php +++ b/app/Census/CensusOfWales1861.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfWales1871.php b/app/Census/CensusOfWales1871.php index 998e3c542d..febb7b4fd3 100644 --- a/app/Census/CensusOfWales1871.php +++ b/app/Census/CensusOfWales1871.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfWales1881.php b/app/Census/CensusOfWales1881.php index 97ea3ea318..3afb49d745 100644 --- a/app/Census/CensusOfWales1881.php +++ b/app/Census/CensusOfWales1881.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfWales1891.php b/app/Census/CensusOfWales1891.php index 6bf3af14bc..939cab847d 100644 --- a/app/Census/CensusOfWales1891.php +++ b/app/Census/CensusOfWales1891.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfWales1901.php b/app/Census/CensusOfWales1901.php index ce4309b2cc..6ed2be8ebe 100644 --- a/app/Census/CensusOfWales1901.php +++ b/app/Census/CensusOfWales1901.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusOfWales1911.php b/app/Census/CensusOfWales1911.php index 604230be27..b02e32fa44 100644 --- a/app/Census/CensusOfWales1911.php +++ b/app/Census/CensusOfWales1911.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Functions/FunctionsEdit.php b/app/Functions/FunctionsEdit.php index 871d7846b7..50ee0a9c46 100644 --- a/app/Functions/FunctionsEdit.php +++ b/app/Functions/FunctionsEdit.php @@ -1029,8 +1029,8 @@ class FunctionsEdit { foreach ($census_places as $census_place) { $options .= '<option value=""></option>'; foreach ($census_place->allCensusDates() as $census) { - $date = new Date($census->censusDate()); - $year = $date->display(false, '%Y', false); + $date = new Date($census->censusDate()); + $year = $date->display(false, '%Y', false); $place_hierarchy = explode(', ', $census->censusPlace()); $options .= '<option value="' . $census->censusDate() . '" data-place="' . $census->censusPlace() . '" data-census="' . get_class($census) . '">' . $place_hierarchy[0] . ' ' . $year . '</option>'; } diff --git a/app/Module/BatchUpdate/BatchUpdateBasePlugin.php b/app/Module/BatchUpdate/BatchUpdateBasePlugin.php index 78f48bf0ee..06a5d52b4c 100644 --- a/app/Module/BatchUpdate/BatchUpdateBasePlugin.php +++ b/app/Module/BatchUpdate/BatchUpdateBasePlugin.php @@ -58,7 +58,7 @@ class BatchUpdateBasePlugin { */ public function getOptionsForm() { return - '<div class="form-group">' . + '<div class="form-group">' . '<label class="control-label col-sm-3">' . I18N::translate('Keep the existing “last change” information') . '</label>' . '<div class="col-sm-9">' . FunctionsEdit::radioButtons('chan', array(0 => I18N::translate('no'), 1 => I18N::translate('yes')), ($this->chan ? 1 : 0), 'class="radio-inline" onchange="this.form.submit();"') . diff --git a/app/Module/BatchUpdateModule.php b/app/Module/BatchUpdateModule.php index 53f7e73e70..1c1a623760 100644 --- a/app/Module/BatchUpdateModule.php +++ b/app/Module/BatchUpdateModule.php @@ -184,7 +184,7 @@ class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface ->setPageTitle(I18N::translate('Batch update')) ->restrictAccess(Auth::isAdmin()) ->pageHeader(); - + echo $this->getJavascript(); ?> <ol class="breadcrumb small"> diff --git a/app/Module/CensusAssistantModule.php b/app/Module/CensusAssistantModule.php index ed60c11035..90447b4fbb 100644 --- a/app/Module/CensusAssistantModule.php +++ b/app/Module/CensusAssistantModule.php @@ -101,7 +101,7 @@ class CensusAssistantModule extends AbstractModule { usort($myindilist, '\Fisharebest\Webtrees\GedcomRecord::compare'); foreach ($myindilist as $indi) { echo '<li>'; - echo '<a href="#" onclick="window.opener.appendCensusRow(\'' . Filter::escapeJs(CensusAssistantModule::censusTableRow($census, $indi, null)) . '\'); window.close();">'; + echo '<a href="#" onclick="window.opener.appendCensusRow(\'' . Filter::escapeJs(self::censusTableRow($census, $indi, null)) . '\'); window.close();">'; echo '<b>' . $indi->getFullName() . '</b>'; echo '</a>'; echo $indi->formatFirstMajorFact(WT_EVENTS_BIRT, 1); @@ -398,7 +398,7 @@ class CensusAssistantModule extends AbstractModule { return '<tr><td></td>' . str_repeat('<td><input type="text"></td>', count($census->columns())) . '</tr>'; } -/** + /** * Generate an HTML row of data for the census * * @param CensusInterface $census @@ -436,7 +436,7 @@ class CensusAssistantModule extends AbstractModule { Functions::getCloseRelationshipName($head, $grandparent) . ' - ' . $grandparent->getFullName(), '#', '', - array('onclick' => 'return appendCensusRow("' . Filter::escapeJs(CensusAssistantModule::censusTableRow($census, $grandparent, $head)) . '");') + array('onclick' => 'return appendCensusRow("' . Filter::escapeJs(self::censusTableRow($census, $grandparent, $head)) . '");') ); $submenu->addClass('submenuitem', ''); $menu->addSubmenu($submenu); @@ -450,7 +450,7 @@ class CensusAssistantModule extends AbstractModule { <?php echo $menu->getMenu(); ?> </td> <td class="facts_value nowrap"> - <a href="#" onclick="return appendCensusRow('<?php echo Filter::escapeJs(CensusAssistantModule::censusTableRow($census, $spouse, $head)); ?>');"> + <a href="#" onclick="return appendCensusRow('<?php echo Filter::escapeJs(self::censusTableRow($census, $spouse, $head)); ?>');"> <?php echo $spouse->getFullName(); ?> </a> </td> @@ -472,7 +472,7 @@ class CensusAssistantModule extends AbstractModule { Functions::getCloseRelationshipName($head, $spouse_family_spouse) . ' - ' . $spouse_family_spouse->getFullName(), '#', '', - array('onclick' => 'return appendCensusRow("' . Filter::escapeJs(CensusAssistantModule::censusTableRow($census, $spouse_family_spouse, $head)) . '");') + array('onclick' => 'return appendCensusRow("' . Filter::escapeJs(self::censusTableRow($census, $spouse_family_spouse, $head)) . '");') ); $submenu->addClass('submenuitem', ''); $menu->addSubmenu($submenu); @@ -484,7 +484,7 @@ class CensusAssistantModule extends AbstractModule { Functions::getCloseRelationshipName($head, $spouse_family_child) . ' - ' . $spouse_family_child->getFullName(), '#', '', - array('onclick' => 'return appendCensusRow("' . Filter::escapeJs(CensusAssistantModule::censusTableRow($census, $spouse_family_child, $head)) . '");') + array('onclick' => 'return appendCensusRow("' . Filter::escapeJs(self::censusTableRow($census, $spouse_family_child, $head)) . '");') ); $submenu->addClass('submenuitem', ''); $menu->addSubmenu($submenu); @@ -498,7 +498,7 @@ class CensusAssistantModule extends AbstractModule { <?php echo $menu->getMenu(); ?> </td> <td class="facts_value"> - <a href="#" onclick="return appendCensusRow('<?php echo Filter::escapeJs(CensusAssistantModule::censusTableRow($census, $child, $head)); ?>');"> + <a href="#" onclick="return appendCensusRow('<?php echo Filter::escapeJs(self::censusTableRow($census, $child, $head)); ?>');"> <?php echo $child->getFullName(); ?> </a> </td> diff --git a/app/Module/GoogleMapsModule.php b/app/Module/GoogleMapsModule.php index 7c6aa22db8..4a253d9411 100644 --- a/app/Module/GoogleMapsModule.php +++ b/app/Module/GoogleMapsModule.php @@ -304,10 +304,10 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, <div class="col-sm-9"> <?php $options = array( - 'ROADMAP' => I18N::translate('Map'), - 'SATELLITE' => I18N::translate('Satellite'), - 'HYBRID' => I18N::translate('Hybrid'), - 'TERRAIN' => I18N::translate('Terrain') + 'ROADMAP' => I18N::translate('Map'), + 'SATELLITE' => I18N::translate('Satellite'), + 'HYBRID' => I18N::translate('Hybrid'), + 'TERRAIN' => I18N::translate('Terrain'), ); echo FunctionsEdit::selectEditControl('GM_MAP_TYPE', $options, null, $this->getSetting('GM_MAP_TYPE'), 'class="form-control"'); ?> @@ -482,7 +482,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, <?php $ph_options = array( 'G_DEFAULT_ICON' => I18N::translate('Standard'), - 'G_FLAG' => I18N::translate('Flag') + 'G_FLAG' => I18N::translate('Flag'), ); echo FunctionsEdit::selectEditControl('GM_PH_MARKER', $ph_options, null, $this->getSetting('GM_PH_MARKER'), 'class="form-control"'); ?> diff --git a/app/Theme/AbstractTheme.php b/app/Theme/AbstractTheme.php index 174184bfe9..f020f31b9c 100644 --- a/app/Theme/AbstractTheme.php +++ b/app/Theme/AbstractTheme.php @@ -324,8 +324,8 @@ abstract class AbstractTheme { protected function favicon() { return '<link rel="icon" href="' . $this->assetUrl() . 'favicon.png" type="image/png">' . - '<link rel="icon" type="image/png" href="' . $this->assetUrl() .'favicon192.png" sizes="192x192">' . - '<link rel="apple-touch-icon" sizes="180x180" href="' . $this->assetUrl() .'favicon180.png">'; + '<link rel="icon" type="image/png" href="' . $this->assetUrl() . 'favicon192.png" sizes="192x192">' . + '<link rel="apple-touch-icon" sizes="180x180" href="' . $this->assetUrl() . 'favicon180.png">'; } /** diff --git a/composer.json b/composer.json index c4de0b0f37..ea34dc1176 100644 --- a/composer.json +++ b/composer.json @@ -22,6 +22,7 @@ "tecnickcom/tcpdf": "6.*" }, "require-dev": { + "fabpot/php-cs-fixer": "*", "mockery/mockery": "*", "phpunit/phpunit": "*", "satooshi/php-coveralls": "dev-master" |