Code style - short array syntax

34 files changed, 409 insertions, 409 deletions

diff --git a/tests/app/Census/CensusColumnAgeMarriedTest.php b/tests/app/Census/CensusColumnAgeMarriedTest.php
index 6265d1ec6d..a49a8d065c 100644
--- a/tests/app/Census/CensusColumnAgeMarriedTest.php
+++ b/tests/app/Census/CensusColumnAgeMarriedTest.php
@@ -39,11 +39,11 @@ class CensusColumnAgeMarriedTest extends \PHPUnit_Framework_TestCase {
 		$fact->shouldReceive('getDate')->andReturn(new Date('01 DEC 1859'));
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
-		$family->shouldReceive('getFacts')->with('MARR', true)->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('MARR', true)->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthDate')->andReturn(new Date('15 MAR 1840'));
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
@@ -66,11 +66,11 @@ class CensusColumnAgeMarriedTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNoMarriage() {
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
-		$family->shouldReceive('getFacts')->with('MARR')->andReturn(array());
+		$family->shouldReceive('getFacts')->with('MARR')->andReturn([]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthDate')->andReturn(new Date(''));
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
@@ -87,7 +87,7 @@ class CensusColumnAgeMarriedTest extends \PHPUnit_Framework_TestCase {
 	public function testNoSpouseFamily() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthDate')->andReturn(new Date('15 MAR 1840'));
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
diff --git a/tests/app/Census/CensusColumnChildrenBornAliveTest.php b/tests/app/Census/CensusColumnChildrenBornAliveTest.php
index c8ff459cb1..7d61d3b6b8 100644
--- a/tests/app/Census/CensusColumnChildrenBornAliveTest.php
+++ b/tests/app/Census/CensusColumnChildrenBornAliveTest.php
@@ -71,11 +71,11 @@ class CensusColumnChildrenBornAliveTest extends \PHPUnit_Framework_TestCase {
 		$child4->shouldReceive('getDeathDate')->andReturn(new Date(''));
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
-		$family->shouldReceive('getChildren')->andReturn(array($child1, $child2, $child3, $child4));
+		$family->shouldReceive('getChildren')->andReturn([$child1, $child2, $child3, $child4]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 MAR 1911');
diff --git a/tests/app/Census/CensusColumnChildrenDiedTest.php b/tests/app/Census/CensusColumnChildrenDiedTest.php
index ef87828a17..e6cebbe339 100644
--- a/tests/app/Census/CensusColumnChildrenDiedTest.php
+++ b/tests/app/Census/CensusColumnChildrenDiedTest.php
@@ -71,11 +71,11 @@ class CensusColumnChildrenDiedTest extends \PHPUnit_Framework_TestCase {
 		$child4->shouldReceive('getDeathDate')->andReturn(new Date(''));
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
-		$family->shouldReceive('getChildren')->andReturn(array($child1, $child2, $child3, $child4));
+		$family->shouldReceive('getChildren')->andReturn([$child1, $child2, $child3, $child4]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 MAR 1911');
diff --git a/tests/app/Census/CensusColumnChildrenLivingTest.php b/tests/app/Census/CensusColumnChildrenLivingTest.php
index 2c3ddeba8f..bce64e4c62 100644
--- a/tests/app/Census/CensusColumnChildrenLivingTest.php
+++ b/tests/app/Census/CensusColumnChildrenLivingTest.php
@@ -71,11 +71,11 @@ class CensusColumnChildrenLivingTest extends \PHPUnit_Framework_TestCase {
 		$child4->shouldReceive('getDeathDate')->andReturn(new Date(''));
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
-		$family->shouldReceive('getChildren')->andReturn(array($child1, $child2, $child3, $child4));
+		$family->shouldReceive('getChildren')->andReturn([$child1, $child2, $child3, $child4]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 MAR 1911');
diff --git a/tests/app/Census/CensusColumnConditionDanishTest.php b/tests/app/Census/CensusColumnConditionDanishTest.php
index 6caedbfe8b..0dc73e2900 100644
--- a/tests/app/Census/CensusColumnConditionDanishTest.php
+++ b/tests/app/Census/CensusColumnConditionDanishTest.php
@@ -37,7 +37,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase {
 	public function testNoSpouseFamiliesMale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -55,7 +55,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase {
 	public function testNoSpouseFamiliesFemale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -76,12 +76,12 @@ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -101,12 +101,12 @@ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -126,12 +126,12 @@ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -151,12 +151,12 @@ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -175,11 +175,11 @@ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -199,11 +199,11 @@ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -223,11 +223,11 @@ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -247,11 +247,11 @@ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -271,12 +271,12 @@ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -295,12 +295,12 @@ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
diff --git a/tests/app/Census/CensusColumnConditionEnglishTest.php b/tests/app/Census/CensusColumnConditionEnglishTest.php
index 8140e143cd..46fc8fa741 100644
--- a/tests/app/Census/CensusColumnConditionEnglishTest.php
+++ b/tests/app/Census/CensusColumnConditionEnglishTest.php
@@ -37,7 +37,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 	public function testNoSpouseFamiliesMale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -55,7 +55,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 	public function testNoSpouseFamiliesFemale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -76,12 +76,12 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -101,12 +101,12 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -126,12 +126,12 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -151,12 +151,12 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -175,11 +175,11 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -199,11 +199,11 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -223,11 +223,11 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -247,11 +247,11 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -271,12 +271,12 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -295,12 +295,12 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
index 1c2574a4e2..9cc816004a 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
@@ -37,7 +37,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit_Framework_TestCase {
 	public function testNoSpouseFamiliesMale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -55,7 +55,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit_Framework_TestCase {
 	public function testNoSpouseFamiliesFemale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -76,12 +76,12 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -101,12 +101,12 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -126,12 +126,12 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -151,12 +151,12 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -175,11 +175,11 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -199,11 +199,11 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -223,11 +223,11 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -247,11 +247,11 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -271,12 +271,12 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -295,12 +295,12 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
index 7f61396927..8979be71af 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
@@ -37,7 +37,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit_Framework_TestCase {
 	public function testNoSpouseFamiliesMale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -55,7 +55,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit_Framework_TestCase {
 	public function testNoSpouseFamiliesFemale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -76,12 +76,12 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -101,12 +101,12 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -126,12 +126,12 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -151,12 +151,12 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -175,11 +175,11 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -199,11 +199,11 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -223,11 +223,11 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -247,11 +247,11 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -271,12 +271,12 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -295,12 +295,12 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
index 86e45d5a4a..e15b42bb75 100644
--- a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
@@ -37,7 +37,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit_Framework_TestCase
 	public function testNoSpouseFamiliesMale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -55,7 +55,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit_Framework_TestCase
 	public function testNoSpouseFamiliesFemale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -76,12 +76,12 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit_Framework_TestCase
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -101,12 +101,12 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit_Framework_TestCase
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -126,12 +126,12 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit_Framework_TestCase
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -151,12 +151,12 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit_Framework_TestCase
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -175,11 +175,11 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit_Framework_TestCase
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -199,11 +199,11 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit_Framework_TestCase
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -223,11 +223,11 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit_Framework_TestCase
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -247,11 +247,11 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit_Framework_TestCase
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -271,12 +271,12 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit_Framework_TestCase
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -295,12 +295,12 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit_Framework_TestCase
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
index dab22c9121..b5e52cd10c 100644
--- a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
@@ -37,7 +37,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit_Framework_TestCase {
 	public function testNoSpouseFamiliesMale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -55,7 +55,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit_Framework_TestCase {
 	public function testNoSpouseFamiliesFemale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -76,12 +76,12 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -101,12 +101,12 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -126,12 +126,12 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -151,12 +151,12 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -175,11 +175,11 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -199,11 +199,11 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -223,11 +223,11 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -247,11 +247,11 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -271,12 +271,12 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -295,12 +295,12 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
index 458454df0b..f06952b4a3 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
@@ -37,7 +37,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit_Framework_TestCase {
 	public function testNoSpouseFamiliesMale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -55,7 +55,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit_Framework_TestCase {
 	public function testNoSpouseFamiliesFemale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -76,12 +76,12 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -101,12 +101,12 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -126,12 +126,12 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -151,12 +151,12 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -175,11 +175,11 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -199,11 +199,11 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -223,11 +223,11 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -247,11 +247,11 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -271,12 +271,12 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -295,12 +295,12 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
index f251db7368..0f9126165e 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
@@ -37,7 +37,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit_Framework_TestCase {
 	public function testNoSpouseFamiliesMale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -55,7 +55,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit_Framework_TestCase {
 	public function testNoSpouseFamiliesFemale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -76,12 +76,12 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -101,12 +101,12 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -126,12 +126,12 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -151,12 +151,12 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -175,11 +175,11 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -199,11 +199,11 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -223,11 +223,11 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -247,11 +247,11 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -271,12 +271,12 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -295,12 +295,12 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
diff --git a/tests/app/Census/CensusColumnConditionUsTest.php b/tests/app/Census/CensusColumnConditionUsTest.php
index 5f55c956b2..cdf60f4e3f 100644
--- a/tests/app/Census/CensusColumnConditionUsTest.php
+++ b/tests/app/Census/CensusColumnConditionUsTest.php
@@ -37,7 +37,7 @@ class CensusColumnConditionUsTest extends \PHPUnit_Framework_TestCase {
 	public function testNoSpouseFamiliesMale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -55,7 +55,7 @@ class CensusColumnConditionUsTest extends \PHPUnit_Framework_TestCase {
 	public function testNoSpouseFamiliesFemale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -76,12 +76,12 @@ class CensusColumnConditionUsTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -101,12 +101,12 @@ class CensusColumnConditionUsTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -126,12 +126,12 @@ class CensusColumnConditionUsTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -151,12 +151,12 @@ class CensusColumnConditionUsTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->andReturn(array());
+		$family->shouldReceive('getFacts')->andReturn([]);
 		$family->shouldReceive('getSpouse')->andReturn($spouse);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -175,11 +175,11 @@ class CensusColumnConditionUsTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -199,11 +199,11 @@ class CensusColumnConditionUsTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -223,11 +223,11 @@ class CensusColumnConditionUsTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -247,11 +247,11 @@ class CensusColumnConditionUsTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -271,12 +271,12 @@ class CensusColumnConditionUsTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -295,12 +295,12 @@ class CensusColumnConditionUsTest extends \PHPUnit_Framework_TestCase {
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
-		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn([]);
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
diff --git a/tests/app/Census/CensusColumnFullNameTest.php b/tests/app/Census/CensusColumnFullNameTest.php
index c3a9139448..a18d07c6d8 100644
--- a/tests/app/Census/CensusColumnFullNameTest.php
+++ b/tests/app/Census/CensusColumnFullNameTest.php
@@ -35,8 +35,8 @@ class CensusColumnFullNameTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testFullName() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getAllNames')->andReturn(array(array('full' => 'Joe Bloggs')));
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getAllNames')->andReturn([['full' => 'Joe Bloggs']]);
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('');
diff --git a/tests/app/Census/CensusColumnGivenNameInitialTest.php b/tests/app/Census/CensusColumnGivenNameInitialTest.php
index cd4a775c45..80b957bc76 100644
--- a/tests/app/Census/CensusColumnGivenNameInitialTest.php
+++ b/tests/app/Census/CensusColumnGivenNameInitialTest.php
@@ -35,7 +35,7 @@ class CensusColumnGivenNameInitialTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testOneGivenName() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getAllNames')->andReturn(array(array('givn' => 'Joe')));
+		$individual->shouldReceive('getAllNames')->andReturn([['givn' => 'Joe']]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -50,7 +50,7 @@ class CensusColumnGivenNameInitialTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testMultipleGivenNames() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getAllNames')->andReturn(array(array('givn' => 'Joe Fred')));
+		$individual->shouldReceive('getAllNames')->andReturn([['givn' => 'Joe Fred']]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -65,7 +65,7 @@ class CensusColumnGivenNameInitialTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNoName() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getAllNames')->andReturn(array());
+		$individual->shouldReceive('getAllNames')->andReturn([]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
diff --git a/tests/app/Census/CensusColumnGivenNamesTest.php b/tests/app/Census/CensusColumnGivenNamesTest.php
index 561b99dff9..5597f00797 100644
--- a/tests/app/Census/CensusColumnGivenNamesTest.php
+++ b/tests/app/Census/CensusColumnGivenNamesTest.php
@@ -35,7 +35,7 @@ class CensusColumnGivenNamesTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testGivenNames() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getAllNames')->andReturn(array(array('givn' => 'Joe')));
+		$individual->shouldReceive('getAllNames')->andReturn([['givn' => 'Joe']]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -50,7 +50,7 @@ class CensusColumnGivenNamesTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNoName() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getAllNames')->andReturn(array());
+		$individual->shouldReceive('getAllNames')->andReturn([]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
diff --git a/tests/app/Census/CensusColumnMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
index 115cf66d3e..24e92c79db 100644
--- a/tests/app/Census/CensusColumnMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
@@ -39,10 +39,10 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit_Framework_TestCase {
 		$fact->shouldReceive('getDate')->andReturn(new Date('01 DEC 1859'));
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
-		$family->shouldReceive('getFacts')->with('MARR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('MARR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
@@ -61,10 +61,10 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit_Framework_TestCase {
 		$fact->shouldReceive('getDate')->andReturn(new Date('01 JAN 1859'));
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
-		$family->shouldReceive('getFacts')->with('MARR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('MARR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
@@ -83,10 +83,10 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit_Framework_TestCase {
 		$fact->shouldReceive('getDate')->andReturn(new Date('02 JUN 1860'));
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
-		$family->shouldReceive('getFacts')->with('MARR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('MARR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
@@ -102,10 +102,10 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNoMarriage() {
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
-		$family->shouldReceive('getFacts')->with('MARR')->andReturn(array());
+		$family->shouldReceive('getFacts')->with('MARR')->andReturn([]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
@@ -121,7 +121,7 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNoSpouseFamily() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
diff --git a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
index aca477d979..1b703842ff 100644
--- a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
@@ -39,10 +39,10 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit_Framework_TestCa
 		$fact->shouldReceive('getDate')->andReturn(new Date('01 DEC 1859'));
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
-		$family->shouldReceive('getFacts')->with('MARR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('MARR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
@@ -61,10 +61,10 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit_Framework_TestCa
 		$fact->shouldReceive('getDate')->andReturn(new Date('01 JAN 1859'));
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
-		$family->shouldReceive('getFacts')->with('MARR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('MARR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
@@ -83,10 +83,10 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit_Framework_TestCa
 		$fact->shouldReceive('getDate')->andReturn(new Date('02 JUN 1860'));
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
-		$family->shouldReceive('getFacts')->with('MARR')->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('MARR')->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
@@ -102,10 +102,10 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit_Framework_TestCa
 	 */
 	public function testNoMarriage() {
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
-		$family->shouldReceive('getFacts')->with('MARR')->andReturn(array());
+		$family->shouldReceive('getFacts')->with('MARR')->andReturn([]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
@@ -121,7 +121,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit_Framework_TestCa
 	 */
 	public function testNoSpouseFamily() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
diff --git a/tests/app/Census/CensusColumnNationalityTest.php b/tests/app/Census/CensusColumnNationalityTest.php
index 47578ef5c6..abdf69b562 100644
--- a/tests/app/Census/CensusColumnNationalityTest.php
+++ b/tests/app/Census/CensusColumnNationalityTest.php
@@ -37,7 +37,7 @@ class CensusColumnNationalityTest extends \PHPUnit_Framework_TestCase {
 	public function testNoBirthPlace() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('');
-		$individual->shouldReceive('getFacts')->andReturn(array());
+		$individual->shouldReceive('getFacts')->andReturn([]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Deutschland');
@@ -54,7 +54,7 @@ class CensusColumnNationalityTest extends \PHPUnit_Framework_TestCase {
 	public function testPlaceCountry() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Australia');
-		$individual->shouldReceive('getFacts')->andReturn(array());
+		$individual->shouldReceive('getFacts')->andReturn([]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
@@ -71,7 +71,7 @@ class CensusColumnNationalityTest extends \PHPUnit_Framework_TestCase {
 	public function testBritish() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('London, England');
-		$individual->shouldReceive('getFacts')->andReturn(array());
+		$individual->shouldReceive('getFacts')->andReturn([]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
@@ -102,10 +102,10 @@ class CensusColumnNationalityTest extends \PHPUnit_Framework_TestCase {
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('London, England');
-		$individual->shouldReceive('getFacts')->andReturn(array(
+		$individual->shouldReceive('getFacts')->andReturn([
 			$fact1,
 			$fact2,
-		));
+		]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
diff --git a/tests/app/Census/CensusColumnOccupationTest.php b/tests/app/Census/CensusColumnOccupationTest.php
index fd4ee4538d..7ab340078f 100644
--- a/tests/app/Census/CensusColumnOccupationTest.php
+++ b/tests/app/Census/CensusColumnOccupationTest.php
@@ -35,7 +35,7 @@ class CensusColumnOccupationTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNoOccupation() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getFacts')->withArgs(array('OCCU'))->andReturn(array());
+		$individual->shouldReceive('getFacts')->withArgs(['OCCU'])->andReturn([]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -53,7 +53,7 @@ class CensusColumnOccupationTest extends \PHPUnit_Framework_TestCase {
 		$fact->shouldReceive('getValue')->andReturn('Farmer');
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getFacts')->withArgs(array('OCCU'))->andReturn(array($fact));
+		$individual->shouldReceive('getFacts')->withArgs(['OCCU'])->andReturn([$fact]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
diff --git a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
index a7b93f00ca..16287878a2 100644
--- a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
+++ b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
@@ -35,8 +35,8 @@ class CensusColumnSurnameGivenNameInitialTest extends \PHPUnit_Framework_TestCas
 	 */
 	public function testOneGivenName() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getAllNames')->andReturn(array(array('givn' => 'Joe', 'surn' => 'Sixpack')));
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getAllNames')->andReturn([['givn' => 'Joe', 'surn' => 'Sixpack']]);
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('');
@@ -52,8 +52,8 @@ class CensusColumnSurnameGivenNameInitialTest extends \PHPUnit_Framework_TestCas
 	 */
 	public function testMultipleGivenNames() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getAllNames')->andReturn(array(array('givn' => 'Joe Fred', 'surn' => 'Sixpack')));
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getAllNames')->andReturn([['givn' => 'Joe Fred', 'surn' => 'Sixpack']]);
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('');
diff --git a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php
index 8b599a9c45..4ed906103e 100644
--- a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php
+++ b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php
@@ -35,8 +35,8 @@ class CensusColumnSurnameGivenNamesTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testOneGivenName() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getAllNames')->andReturn(array(array('givn' => 'Joe', 'surn' => 'Sixpack')));
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getAllNames')->andReturn([['givn' => 'Joe', 'surn' => 'Sixpack']]);
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('');
@@ -52,8 +52,8 @@ class CensusColumnSurnameGivenNamesTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testMultipleGivenNames() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getAllNames')->andReturn(array(array('givn' => 'Joe Fred', 'surn' => 'Sixpack')));
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getAllNames')->andReturn([['givn' => 'Joe Fred', 'surn' => 'Sixpack']]);
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('');
@@ -69,8 +69,8 @@ class CensusColumnSurnameGivenNamesTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNoName() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getAllNames')->andReturn(array());
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getAllNames')->andReturn([]);
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('');
diff --git a/tests/app/Census/CensusColumnSurnameTest.php b/tests/app/Census/CensusColumnSurnameTest.php
index c5c2e495a6..6710585367 100644
--- a/tests/app/Census/CensusColumnSurnameTest.php
+++ b/tests/app/Census/CensusColumnSurnameTest.php
@@ -35,7 +35,7 @@ class CensusColumnSurnameTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testSurname() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getAllNames')->andReturn(array(array('surname' => 'Bloggs')));
+		$individual->shouldReceive('getAllNames')->andReturn([['surname' => 'Bloggs']]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -50,7 +50,7 @@ class CensusColumnSurnameTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNoName() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getAllNames')->andReturn(array());
+		$individual->shouldReceive('getAllNames')->andReturn([]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
diff --git a/tests/app/Census/CensusColumnYearsMarriedTest.php b/tests/app/Census/CensusColumnYearsMarriedTest.php
index d96512a629..32e5c43d8f 100644
--- a/tests/app/Census/CensusColumnYearsMarriedTest.php
+++ b/tests/app/Census/CensusColumnYearsMarriedTest.php
@@ -36,7 +36,7 @@ class CensusColumnYearsMarriedTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNoSpouseFamily() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
@@ -52,10 +52,10 @@ class CensusColumnYearsMarriedTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNoMarriage() {
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
-		$family->shouldReceive('getFacts')->with('MARR', true)->andReturn(array());
+		$family->shouldReceive('getFacts')->with('MARR', true)->andReturn([]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
@@ -74,10 +74,10 @@ class CensusColumnYearsMarriedTest extends \PHPUnit_Framework_TestCase {
 		$fact->shouldReceive('getDate')->andReturn(new Date(''));
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
-		$family->shouldReceive('getFacts')->with('MARR', true)->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('MARR', true)->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
@@ -96,10 +96,10 @@ class CensusColumnYearsMarriedTest extends \PHPUnit_Framework_TestCase {
 		$fact->shouldReceive('getDate')->andReturn(new Date('1861'));
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
-		$family->shouldReceive('getFacts')->with('MARR', true)->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('MARR', true)->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
@@ -118,10 +118,10 @@ class CensusColumnYearsMarriedTest extends \PHPUnit_Framework_TestCase {
 		$fact->shouldReceive('getDate')->andReturn(new Date('OCT 1851'));
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
-		$family->shouldReceive('getFacts')->with('MARR', true)->andReturn(array($fact));
+		$family->shouldReceive('getFacts')->with('MARR', true)->andReturn([$fact]);
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
diff --git a/tests/app/MenuTest.php b/tests/app/MenuTest.php
index b22fbc2d2f..64fcf7ba21 100644
--- a/tests/app/MenuTest.php
+++ b/tests/app/MenuTest.php
@@ -36,21 +36,21 @@ class MenuTest extends \PHPUnit_Framework_TestCase {
 		$this->assertSame('Test!', $menu->getLabel());
 		$this->assertSame('#', $menu->getLink());
 		$this->assertSame('', $menu->getClass());
-		$this->assertSame(array(), $menu->getAttrs());
-		$this->assertSame(array(), $menu->getSubmenus());
+		$this->assertSame([], $menu->getAttrs());
+		$this->assertSame([], $menu->getSubmenus());
 	}
 
 	/**
 	 * Test the constructor with non-default parameters.
 	 */
 	public function testConstructorNonDefaults() {
-		$submenus = array(new Menu('Submenu'));
-		$menu     = new Menu('Test!', 'link.html', 'link-class', array('foo' => 'bar'), $submenus);
+		$submenus = [new Menu('Submenu')];
+		$menu     = new Menu('Test!', 'link.html', 'link-class', ['foo' => 'bar'], $submenus);
 
 		$this->assertSame('Test!', $menu->getLabel());
 		$this->assertSame('link.html', $menu->getLink());
 		$this->assertSame('link-class', $menu->getClass());
-		$this->assertSame(array('foo' => 'bar'), $menu->getAttrs());
+		$this->assertSame(['foo' => 'bar'], $menu->getAttrs());
 		$this->assertSame($submenus, $menu->getSubmenus());
 	}
 
@@ -96,10 +96,10 @@ class MenuTest extends \PHPUnit_Framework_TestCase {
 	public function testGetterSetterAttrs() {
 		$menu = new Menu('Test!');
 
-		$return = $menu->setAttrs(array('foo' => 'bar'));
+		$return = $menu->setAttrs(['foo' => 'bar']);
 
 		$this->assertSame($return, $menu);
-		$this->assertSame(array('foo' => 'bar'), $menu->getAttrs());
+		$this->assertSame(['foo' => 'bar'], $menu->getAttrs());
 	}
 
 	/**
@@ -107,10 +107,10 @@ class MenuTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testGetterSetterSubmenus() {
 		$menu     = new Menu('Test!');
-		$submenus = array(
+		$submenus = [
 			new Menu('Sub1'),
 			new Menu('Sub2'),
-		);
+		];
 
 		$return = $menu->setSubmenus($submenus);
 
@@ -167,7 +167,7 @@ class MenuTest extends \PHPUnit_Framework_TestCase {
 	 * Test the list rendering for an onclick link.
 	 */
 	public function testFormatAsListWithAttrs() {
-		$menu = new Menu('Test!', '#', '', array('foo' => 'bar'));
+		$menu = new Menu('Test!', '#', '', ['foo' => 'bar']);
 
 		$this->assertSame('<li class=""><a href="#" foo="bar">Test!</a></li>', $menu->getMenuAsList());
 	}
@@ -176,7 +176,7 @@ class MenuTest extends \PHPUnit_Framework_TestCase {
 	 * Test the list rendering for an onclick link.
 	 */
 	public function testFormatAsListWithAttrsAndId() {
-		$menu = new Menu('Test!', '#', 'link-class', array('foo' => 'bar'));
+		$menu = new Menu('Test!', '#', 'link-class', ['foo' => 'bar']);
 
 		$this->assertSame('<li class="link-class"><a href="#" foo="bar">Test!</a></li>', $menu->getMenuAsList());
 	}
diff --git a/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php b/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php
index 78f4bd5367..2d70a02d05 100644
--- a/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php
@@ -56,7 +56,7 @@ class DefaultSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSonNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'M')
 		);
 	}
@@ -68,7 +68,7 @@ class DefaultSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewDaughterNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'F')
 		);
 	}
@@ -80,7 +80,7 @@ class DefaultSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'U')
 		);
 	}
@@ -92,7 +92,7 @@ class DefaultSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewFatherNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newParentNames('John /White/', 'M')
 		);
 	}
@@ -104,7 +104,7 @@ class DefaultSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewMotherNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newParentNames('John /White/', 'F')
 		);
 	}
@@ -116,7 +116,7 @@ class DefaultSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewParentNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newParentNames('John /White/', 'U')
 		);
 	}
@@ -128,7 +128,7 @@ class DefaultSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewHusbandNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newSpouseNames('Mary /Black/', 'M')
 		);
 	}
@@ -140,7 +140,7 @@ class DefaultSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewWifeNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newSpouseNames('John /White/', 'F')
 		);
 	}
@@ -152,7 +152,7 @@ class DefaultSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSpouseNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newSpouseNames('Chris /Green/', 'U')
 		);
 	}
diff --git a/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php b/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php
index 85b0435aea..fd7c2d9056 100644
--- a/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php
@@ -56,7 +56,7 @@ class IcelandicSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSonNames() {
 		$this->assertSame(
-			array('NAME' => 'Jonsson'),
+			['NAME' => 'Jonsson'],
 			$this->surname_tradition->newChildNames('Jon Einarsson', 'Eva Stefansdottir', 'M')
 		);
 	}
@@ -68,7 +68,7 @@ class IcelandicSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewDaughterNames() {
 		$this->assertSame(
-			array('NAME' => 'Jonsdottir'),
+			['NAME' => 'Jonsdottir'],
 			$this->surname_tradition->newChildNames('Jon Einarsson', 'Eva Stefansdottir', 'F')
 		);
 	}
@@ -80,7 +80,7 @@ class IcelandicSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNames() {
 		$this->assertSame(
-			array(),
+			[],
 			$this->surname_tradition->newChildNames('Jon Einarsson', 'Eva Stefansdottir', 'U')
 		);
 	}
@@ -92,7 +92,7 @@ class IcelandicSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewFatherNames() {
 		$this->assertSame(
-			array('NAME' => 'Einar', 'GIVN' => 'Einar'),
+			['NAME' => 'Einar', 'GIVN' => 'Einar'],
 			$this->surname_tradition->newParentNames('Jon Einarsson', 'M')
 		);
 	}
@@ -104,7 +104,7 @@ class IcelandicSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewMotherNames() {
 		$this->assertSame(
-			array(),
+			[],
 			$this->surname_tradition->newParentNames('Jon Einarsson', 'F')
 		);
 	}
@@ -116,7 +116,7 @@ class IcelandicSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewParentNames() {
 		$this->assertSame(
-			array(),
+			[],
 			$this->surname_tradition->newParentNames('Jon Einarsson', 'U')
 		);
 	}
@@ -128,7 +128,7 @@ class IcelandicSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewHusbandNames() {
 		$this->assertSame(
-			array(),
+			[],
 			$this->surname_tradition->newSpouseNames('Eva Stefansdottir', 'M')
 		);
 	}
@@ -140,7 +140,7 @@ class IcelandicSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewWifeNames() {
 		$this->assertSame(
-			array(),
+			[],
 			$this->surname_tradition->newSpouseNames('Jon Einarsson', 'F')
 		);
 	}
@@ -152,7 +152,7 @@ class IcelandicSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSpouseNames() {
 		$this->assertSame(
-			array(),
+			[],
 			$this->surname_tradition->newSpouseNames('Jon Einarsson', 'U')
 		);
 	}
diff --git a/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php b/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php
index a806f59f37..1635c3dbdb 100644
--- a/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php
@@ -59,7 +59,7 @@ class LithuanianSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSonNames() {
 		$this->assertSame(
-			array('NAME' => '/White/', 'SURN' => 'White'),
+			['NAME' => '/White/', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'M')
 		);
 	}
@@ -72,7 +72,7 @@ class LithuanianSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewDaughterNames() {
 		$this->assertSame(
-			array('NAME' => '/White/', 'SURN' => 'White'),
+			['NAME' => '/White/', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'F')
 		);
 	}
@@ -85,27 +85,27 @@ class LithuanianSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewDaughterNamesInflected() {
 		$this->assertSame(
-			array('NAME' => '/Whitaitė/', 'SURN' => 'Whita'),
+			['NAME' => '/Whitaitė/', 'SURN' => 'Whita'],
 			$this->surname_tradition->newChildNames('John /Whita/', 'Mary /Black/', 'F')
 		);
 		$this->assertSame(
-			array('NAME' => '/Whitaitė/', 'SURN' => 'Whitas'),
+			['NAME' => '/Whitaitė/', 'SURN' => 'Whitas'],
 			$this->surname_tradition->newChildNames('John /Whitas/', 'Mary /Black/', 'F')
 		);
 		$this->assertSame(
-			array('NAME' => '/Whitytė/', 'SURN' => 'Whitis'),
+			['NAME' => '/Whitytė/', 'SURN' => 'Whitis'],
 			$this->surname_tradition->newChildNames('John /Whitis/', 'Mary /Black/', 'F')
 		);
 		$this->assertSame(
-			array('NAME' => '/Whitytė/', 'SURN' => 'Whitys'),
+			['NAME' => '/Whitytė/', 'SURN' => 'Whitys'],
 			$this->surname_tradition->newChildNames('John /Whitys/', 'Mary /Black/', 'F')
 		);
 		$this->assertSame(
-			array('NAME' => '/Whitiūtė/', 'SURN' => 'Whitius'),
+			['NAME' => '/Whitiūtė/', 'SURN' => 'Whitius'],
 			$this->surname_tradition->newChildNames('John /Whitius/', 'Mary /Black/', 'F')
 		);
 		$this->assertSame(
-			array('NAME' => '/Whitutė/', 'SURN' => 'Whitus'),
+			['NAME' => '/Whitutė/', 'SURN' => 'Whitus'],
 			$this->surname_tradition->newChildNames('John /Whitus/', 'Mary /Black/', 'F')
 		);
 	}
@@ -118,7 +118,7 @@ class LithuanianSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNames() {
 		$this->assertSame(
-			array('NAME' => '/White/', 'SURN' => 'White'),
+			['NAME' => '/White/', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'U')
 		);
 	}
@@ -131,7 +131,7 @@ class LithuanianSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNamesWithNoParentsNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newChildNames('', '', 'U')
 		);
 	}
@@ -144,7 +144,7 @@ class LithuanianSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewFatherNames() {
 		$this->assertSame(
-			array('NAME' => '/White/', 'SURN' => 'White'),
+			['NAME' => '/White/', 'SURN' => 'White'],
 			$this->surname_tradition->newParentNames('John /White/', 'M')
 		);
 	}
@@ -157,19 +157,19 @@ class LithuanianSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewFatherNamesInflected() {
 		$this->assertSame(
-			array('NAME' => '/Whitas/', 'SURN' => 'Whitas'),
+			['NAME' => '/Whitas/', 'SURN' => 'Whitas'],
 			$this->surname_tradition->newParentNames('Mary /Whitaitė/', 'M')
 		);
 		$this->assertSame(
-			array('NAME' => '/Whitis/', 'SURN' => 'Whitis'),
+			['NAME' => '/Whitis/', 'SURN' => 'Whitis'],
 			$this->surname_tradition->newParentNames('Mary /Whitytė/', 'M')
 		);
 		$this->assertSame(
-			array('NAME' => '/Whitius/', 'SURN' => 'Whitius'),
+			['NAME' => '/Whitius/', 'SURN' => 'Whitius'],
 			$this->surname_tradition->newParentNames('Mary /Whitiūtė/', 'M')
 		);
 		$this->assertSame(
-			array('NAME' => '/Whitus/', 'SURN' => 'Whitus'),
+			['NAME' => '/Whitus/', 'SURN' => 'Whitus'],
 			$this->surname_tradition->newParentNames('Mary /Whitutė/', 'M')
 		);
 	}
@@ -182,7 +182,7 @@ class LithuanianSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewMotherNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newParentNames('John /White/', 'F')
 		);
 	}
@@ -195,7 +195,7 @@ class LithuanianSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewParentNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newParentNames('John /White/', 'U')
 		);
 	}
@@ -208,7 +208,7 @@ class LithuanianSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewHusbandNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newSpouseNames('Mary /Black/', 'M')
 		);
 	}
@@ -221,7 +221,7 @@ class LithuanianSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewWifeNames() {
 		$this->assertSame(
-			array('NAME' => '//', '_MARNM' => '/White/'),
+			['NAME' => '//', '_MARNM' => '/White/'],
 			$this->surname_tradition->newSpouseNames('John /White/', 'F')
 		);
 	}
@@ -234,7 +234,7 @@ class LithuanianSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSpouseNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newSpouseNames('Chris /Green/', 'U')
 		);
 	}
diff --git a/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php b/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php
index ca78697fb3..5ce3189dc6 100644
--- a/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php
@@ -56,7 +56,7 @@ class MatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSonNames() {
 		$this->assertSame(
-			array('NAME' => '/Black/', 'SURN' => 'Black'),
+			['NAME' => '/Black/', 'SURN' => 'Black'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'M')
 		);
 	}
@@ -68,7 +68,7 @@ class MatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewDaughterNames() {
 		$this->assertSame(
-			array('NAME' => '/Black/', 'SURN' => 'Black'),
+			['NAME' => '/Black/', 'SURN' => 'Black'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'F')
 		);
 	}
@@ -80,7 +80,7 @@ class MatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNames() {
 		$this->assertSame(
-			array('NAME' => '/Black/', 'SURN' => 'Black'),
+			['NAME' => '/Black/', 'SURN' => 'Black'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'U')
 		);
 	}
@@ -92,7 +92,7 @@ class MatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNamesWithSpfx() {
 		$this->assertSame(
-			array('NAME' => '/van Black/', 'SPFX' => 'van', 'SURN' => 'Black'),
+			['NAME' => '/van Black/', 'SPFX' => 'van', 'SURN' => 'Black'],
 			$this->surname_tradition->newChildNames('John /de White/', 'Mary /van Black/', 'U')
 		);
 	}
@@ -104,7 +104,7 @@ class MatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNamesWithNoParentsNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newChildNames('', '', 'U')
 		);
 	}
@@ -116,7 +116,7 @@ class MatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewFatherNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newParentNames('John /White/', 'M')
 		);
 	}
@@ -128,7 +128,7 @@ class MatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewMotherNames() {
 		$this->assertSame(
-			array('NAME' => '/White/', 'SURN' => 'White'),
+			['NAME' => '/White/', 'SURN' => 'White'],
 			$this->surname_tradition->newParentNames('John /White/', 'F')
 		);
 	}
@@ -140,7 +140,7 @@ class MatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewParentNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newParentNames('John /White/', 'U')
 		);
 	}
@@ -152,7 +152,7 @@ class MatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewHusbandNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newSpouseNames('Mary /Black/', 'M')
 		);
 	}
@@ -164,7 +164,7 @@ class MatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewWifeNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newSpouseNames('John /White/', 'F')
 		);
 	}
@@ -176,7 +176,7 @@ class MatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSpouseNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newSpouseNames('Chris /Green/', 'U')
 		);
 	}
diff --git a/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php b/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php
index 6449bce606..300d971f83 100644
--- a/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php
@@ -56,7 +56,7 @@ class PaternalSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSonNames() {
 		$this->assertSame(
-			array('NAME' => '/White/', 'SURN' => 'White'),
+			['NAME' => '/White/', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'M')
 		);
 	}
@@ -68,7 +68,7 @@ class PaternalSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewDaughterNames() {
 		$this->assertSame(
-			array('NAME' => '/White/', 'SURN' => 'White'),
+			['NAME' => '/White/', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'F')
 		);
 	}
@@ -80,7 +80,7 @@ class PaternalSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNames() {
 		$this->assertSame(
-			array('NAME' => '/White/', 'SURN' => 'White'),
+			['NAME' => '/White/', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'U')
 		);
 	}
@@ -92,7 +92,7 @@ class PaternalSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNamesWithSpfx() {
 		$this->assertSame(
-			array('NAME' => '/de White/', 'SPFX' => 'de', 'SURN' => 'White'),
+			['NAME' => '/de White/', 'SPFX' => 'de', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /de White/', 'Mary /van Black/', 'U')
 		);
 	}
@@ -104,7 +104,7 @@ class PaternalSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNamesWithMultipleSpfx() {
 		$this->assertSame(
-			array('NAME' => '/van der White/', 'SPFX' => 'van der', 'SURN' => 'White'),
+			['NAME' => '/van der White/', 'SPFX' => 'van der', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /van der White/', 'Mary /van Black/', 'U')
 		);
 	}
@@ -116,11 +116,11 @@ class PaternalSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNamesWithDutchSpfx() {
 		$this->assertSame(
-			array('NAME' => '/\'t White/', 'SPFX' => '\'t', 'SURN' => 'White'),
+			['NAME' => '/\'t White/', 'SPFX' => '\'t', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /\'t White/', 'Mary /van Black/', 'U')
 		);
 		$this->assertSame(
-			array('NAME' => '/’t White/', 'SPFX' => '’t', 'SURN' => 'White'),
+			['NAME' => '/’t White/', 'SPFX' => '’t', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /’t White/', 'Mary /van Black/', 'U')
 		);
 	}
@@ -132,11 +132,11 @@ class PaternalSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNamesWithMultipleDutchSpfx() {
 		$this->assertSame(
-			array('NAME' => '/van \'t White/', 'SPFX' => 'van \'t', 'SURN' => 'White'),
+			['NAME' => '/van \'t White/', 'SPFX' => 'van \'t', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /van \'t White/', 'Mary /van Black/', 'U')
 		);
 		$this->assertSame(
-			array('NAME' => '/van ’t White/', 'SPFX' => 'van ’t', 'SURN' => 'White'),
+			['NAME' => '/van ’t White/', 'SPFX' => 'van ’t', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /van ’t White/', 'Mary /van Black/', 'U')
 		);
 	}
@@ -148,7 +148,7 @@ class PaternalSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewFatherNames() {
 		$this->assertSame(
-			array('NAME' => '/White/', 'SURN' => 'White'),
+			['NAME' => '/White/', 'SURN' => 'White'],
 			$this->surname_tradition->newParentNames('John /White/', 'M')
 		);
 	}
@@ -160,7 +160,7 @@ class PaternalSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewMotherNames() {
 		$this->assertSame(
-			array('NAME' => '//', '_MARNM' => '/White/'),
+			['NAME' => '//', '_MARNM' => '/White/'],
 			$this->surname_tradition->newParentNames('John /White/', 'F')
 		);
 	}
@@ -172,7 +172,7 @@ class PaternalSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewParentNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newParentNames('John /White/', 'U')
 		);
 	}
@@ -184,7 +184,7 @@ class PaternalSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewHusbandNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newSpouseNames('Mary /Black/', 'M')
 		);
 	}
@@ -196,7 +196,7 @@ class PaternalSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewWifeNames() {
 		$this->assertSame(
-			array('NAME' => '//', '_MARNM' => '/White/'),
+			['NAME' => '//', '_MARNM' => '/White/'],
 			$this->surname_tradition->newSpouseNames('John /White/', 'F')
 		);
 	}
@@ -208,7 +208,7 @@ class PaternalSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewWifeNamesWithSpfx() {
 		$this->assertSame(
-			array('NAME' => '//', '_MARNM' => '/van der White/'),
+			['NAME' => '//', '_MARNM' => '/van der White/'],
 			$this->surname_tradition->newSpouseNames('John /van der White/', 'F')
 		);
 	}
@@ -220,7 +220,7 @@ class PaternalSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSpouseNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newSpouseNames('Chris /Green/', 'U')
 		);
 	}
diff --git a/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php b/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php
index 022a51b300..63aa842ba5 100644
--- a/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php
@@ -56,7 +56,7 @@ class PatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSonNames() {
 		$this->assertSame(
-			array('NAME' => '/White/', 'SURN' => 'White'),
+			['NAME' => '/White/', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'M')
 		);
 	}
@@ -68,7 +68,7 @@ class PatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewDaughterNames() {
 		$this->assertSame(
-			array('NAME' => '/White/', 'SURN' => 'White'),
+			['NAME' => '/White/', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'F')
 		);
 	}
@@ -80,7 +80,7 @@ class PatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNames() {
 		$this->assertSame(
-			array('NAME' => '/White/', 'SURN' => 'White'),
+			['NAME' => '/White/', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'U')
 		);
 	}
@@ -92,7 +92,7 @@ class PatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNamesWithSpfx() {
 		$this->assertSame(
-			array('NAME' => '/de White/', 'SPFX' => 'de', 'SURN' => 'White'),
+			['NAME' => '/de White/', 'SPFX' => 'de', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /de White/', 'Mary /van Black/', 'U')
 		);
 	}
@@ -104,7 +104,7 @@ class PatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNamesWithNoParentsNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newChildNames('', '', 'U')
 		);
 	}
@@ -116,7 +116,7 @@ class PatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewFatherNames() {
 		$this->assertSame(
-			array('NAME' => '/White/', 'SURN' => 'White'),
+			['NAME' => '/White/', 'SURN' => 'White'],
 			$this->surname_tradition->newParentNames('John /White/', 'M')
 		);
 	}
@@ -128,7 +128,7 @@ class PatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewMotherNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newParentNames('John /White/', 'F')
 		);
 	}
@@ -140,7 +140,7 @@ class PatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewParentNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newParentNames('John /White/', 'U')
 		);
 	}
@@ -152,7 +152,7 @@ class PatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewHusbandNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newSpouseNames('Mary /Black/', 'M')
 		);
 	}
@@ -164,7 +164,7 @@ class PatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewWifeNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newSpouseNames('John /White/', 'F')
 		);
 	}
@@ -176,7 +176,7 @@ class PatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSpouseNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newSpouseNames('Chris /Green/', 'U')
 		);
 	}
diff --git a/tests/app/SurnameTradition/PolishSurnameTraditionTest.php b/tests/app/SurnameTradition/PolishSurnameTraditionTest.php
index 89eb1834a5..204212d382 100644
--- a/tests/app/SurnameTradition/PolishSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/PolishSurnameTraditionTest.php
@@ -59,7 +59,7 @@ class PolishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSonNames() {
 		$this->assertSame(
-			array('NAME' => '/White/', 'SURN' => 'White'),
+			['NAME' => '/White/', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'M')
 		);
 	}
@@ -72,7 +72,7 @@ class PolishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewDaughterNames() {
 		$this->assertSame(
-			array('NAME' => '/White/', 'SURN' => 'White'),
+			['NAME' => '/White/', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'F')
 		);
 	}
@@ -85,19 +85,19 @@ class PolishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewDaughterNamesInflected() {
 		$this->assertSame(
-			array('NAME' => '/Whitecka/', 'SURN' => 'Whitecki'),
+			['NAME' => '/Whitecka/', 'SURN' => 'Whitecki'],
 			$this->surname_tradition->newChildNames('John /Whitecki/', 'Mary /Black/', 'F')
 		);
 		$this->assertSame(
-			array('NAME' => '/Whitedzka/', 'SURN' => 'Whitedzki'),
+			['NAME' => '/Whitedzka/', 'SURN' => 'Whitedzki'],
 			$this->surname_tradition->newChildNames('John /Whitedzki/', 'Mary /Black/', 'F')
 		);
 		$this->assertSame(
-			array('NAME' => '/Whiteska/', 'SURN' => 'Whiteski'),
+			['NAME' => '/Whiteska/', 'SURN' => 'Whiteski'],
 			$this->surname_tradition->newChildNames('John /Whiteski/', 'Mary /Black/', 'F')
 		);
 		$this->assertSame(
-			array('NAME' => '/Whiteżka/', 'SURN' => 'Whiteżki'),
+			['NAME' => '/Whiteżka/', 'SURN' => 'Whiteżki'],
 			$this->surname_tradition->newChildNames('John /Whiteżki/', 'Mary /Black/', 'F')
 		);
 	}
@@ -110,7 +110,7 @@ class PolishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNames() {
 		$this->assertSame(
-			array('NAME' => '/White/', 'SURN' => 'White'),
+			['NAME' => '/White/', 'SURN' => 'White'],
 			$this->surname_tradition->newChildNames('John /White/', 'Mary /Black/', 'U')
 		);
 	}
@@ -123,7 +123,7 @@ class PolishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNamesWithNoParentsNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newChildNames('', '', 'U')
 		);
 	}
@@ -136,7 +136,7 @@ class PolishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewFatherNames() {
 		$this->assertSame(
-			array('NAME' => '/White/', 'SURN' => 'White'),
+			['NAME' => '/White/', 'SURN' => 'White'],
 			$this->surname_tradition->newParentNames('John /White/', 'M')
 		);
 	}
@@ -149,19 +149,19 @@ class PolishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewFatherNamesInflected() {
 		$this->assertSame(
-			array('NAME' => '/Whitecki/', 'SURN' => 'Whitecki'),
+			['NAME' => '/Whitecki/', 'SURN' => 'Whitecki'],
 			$this->surname_tradition->newParentNames('Mary /Whitecka/', 'M')
 		);
 		$this->assertSame(
-			array('NAME' => '/Whitedzki/', 'SURN' => 'Whitedzki'),
+			['NAME' => '/Whitedzki/', 'SURN' => 'Whitedzki'],
 			$this->surname_tradition->newParentNames('Mary /Whitedzka/', 'M')
 		);
 		$this->assertSame(
-			array('NAME' => '/Whiteski/', 'SURN' => 'Whiteski'),
+			['NAME' => '/Whiteski/', 'SURN' => 'Whiteski'],
 			$this->surname_tradition->newParentNames('Mary /Whiteska/', 'M')
 		);
 		$this->assertSame(
-			array('NAME' => '/Whiteżki/', 'SURN' => 'Whiteżki'),
+			['NAME' => '/Whiteżki/', 'SURN' => 'Whiteżki'],
 			$this->surname_tradition->newParentNames('Mary /Whiteżka/', 'M')
 		);
 	}
@@ -174,7 +174,7 @@ class PolishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewMotherNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newParentNames('John /White/', 'F')
 		);
 	}
@@ -187,7 +187,7 @@ class PolishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewParentNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newParentNames('John /White/', 'U')
 		);
 	}
@@ -200,7 +200,7 @@ class PolishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewHusbandNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newSpouseNames('Mary /Black/', 'M')
 		);
 	}
@@ -213,7 +213,7 @@ class PolishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewWifeNames() {
 		$this->assertSame(
-			array('NAME' => '//', '_MARNM' => '/White/'),
+			['NAME' => '//', '_MARNM' => '/White/'],
 			$this->surname_tradition->newSpouseNames('John /White/', 'F')
 		);
 	}
@@ -226,7 +226,7 @@ class PolishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSpouseNames() {
 		$this->assertSame(
-			array('NAME' => '//'),
+			['NAME' => '//'],
 			$this->surname_tradition->newSpouseNames('Chris /Green/', 'U')
 		);
 	}
diff --git a/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php b/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php
index cc3882f6f7..f5bfea5f91 100644
--- a/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php
@@ -56,7 +56,7 @@ class PortugueseSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSonNames() {
 		$this->assertSame(
-			array('NAME' => '/Iglesias/ /Lorca/', 'SURN' => 'Iglesias,Lorca'),
+			['NAME' => '/Iglesias/ /Lorca/', 'SURN' => 'Iglesias,Lorca'],
 			$this->surname_tradition->newChildNames('Gabriel /Garcia/ /Iglesias/', 'Maria /Ruiz/ /Lorca/', 'M')
 		);
 	}
@@ -68,7 +68,7 @@ class PortugueseSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewDaughterNames() {
 		$this->assertSame(
-			array('NAME' => '/Iglesias/ /Lorca/', 'SURN' => 'Iglesias,Lorca'),
+			['NAME' => '/Iglesias/ /Lorca/', 'SURN' => 'Iglesias,Lorca'],
 			$this->surname_tradition->newChildNames('Gabriel /Garcia/ /Iglesias/', 'Maria /Ruiz/ /Lorca/', 'M')
 		);
 	}
@@ -80,7 +80,7 @@ class PortugueseSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNames() {
 		$this->assertSame(
-			array('NAME' => '/Iglesias/ /Lorca/', 'SURN' => 'Iglesias,Lorca'),
+			['NAME' => '/Iglesias/ /Lorca/', 'SURN' => 'Iglesias,Lorca'],
 			$this->surname_tradition->newChildNames('Gabriel /Garcia/ /Iglesias/', 'Maria /Ruiz/ /Lorca/', 'M')
 		);
 	}
@@ -92,7 +92,7 @@ class PortugueseSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNamesWithNoParentsNames() {
 		$this->assertSame(
-			array('NAME' => '// //', 'SURN' => ''),
+			['NAME' => '// //', 'SURN' => ''],
 			$this->surname_tradition->newChildNames('', '', 'U')
 		);
 	}
@@ -104,11 +104,11 @@ class PortugueseSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNamesCompunds() {
 		$this->assertSame(
-			array('NAME' => '/Iglesias/ /Lorca/', 'SURN' => 'Iglesias,Lorca'),
+			['NAME' => '/Iglesias/ /Lorca/', 'SURN' => 'Iglesias,Lorca'],
 			$this->surname_tradition->newChildNames('Gabriel /Garcia Iglesias/', 'Maria /Ruiz Lorca/', 'M')
 		);
 		$this->assertSame(
-			array('NAME' => '/Iglesias/ /Lorca/', 'SURN' => 'Iglesias,Lorca'),
+			['NAME' => '/Iglesias/ /Lorca/', 'SURN' => 'Iglesias,Lorca'],
 			$this->surname_tradition->newChildNames('Gabriel /Garcia y Iglesias/', 'Maria /Ruiz y Lorca/', 'M')
 		);
 	}
@@ -120,7 +120,7 @@ class PortugueseSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewFatherNames() {
 		$this->assertSame(
-			array('NAME' => '// /Garcia/', 'SURN' => 'Garcia'),
+			['NAME' => '// /Garcia/', 'SURN' => 'Garcia'],
 			$this->surname_tradition->newParentNames('Gabriel /Garcia/ /Iglesias/', 'M')
 		);
 	}
@@ -132,7 +132,7 @@ class PortugueseSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewMotherNames() {
 		$this->assertSame(
-			array('NAME' => '// /Iglesias/', 'SURN' => 'Iglesias'),
+			['NAME' => '// /Iglesias/', 'SURN' => 'Iglesias'],
 			$this->surname_tradition->newParentNames('Gabriel /Garcia/ /Iglesias/', 'F')
 		);
 	}
@@ -144,7 +144,7 @@ class PortugueseSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewParentNames() {
 		$this->assertSame(
-			array('NAME' => '// //'),
+			['NAME' => '// //'],
 			$this->surname_tradition->newParentNames('Gabriel /Garcia/ /Iglesias/', 'U')
 		);
 	}
@@ -156,7 +156,7 @@ class PortugueseSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewHusbandNames() {
 		$this->assertSame(
-			array('NAME' => '// //'),
+			['NAME' => '// //'],
 			$this->surname_tradition->newSpouseNames('Maria /Ruiz/ /Lorca/', 'M')
 		);
 	}
@@ -168,7 +168,7 @@ class PortugueseSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewWifeNames() {
 		$this->assertSame(
-			array('NAME' => '// //'),
+			['NAME' => '// //'],
 			$this->surname_tradition->newSpouseNames('Gabriel /Garcia/ /Iglesias/', 'F')
 		);
 	}
@@ -180,7 +180,7 @@ class PortugueseSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSpouseNames() {
 		$this->assertSame(
-			array('NAME' => '// //'),
+			['NAME' => '// //'],
 			$this->surname_tradition->newSpouseNames('Gabriel /Garcia/ /Iglesias/', 'U')
 		);
 	}
diff --git a/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php b/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php
index 393b1f2f7c..1a83a9d222 100644
--- a/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php
@@ -56,7 +56,7 @@ class SpanishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSonNames() {
 		$this->assertSame(
-			array('NAME' => '/Garcia/ /Ruiz/', 'SURN' => 'Garcia,Ruiz'),
+			['NAME' => '/Garcia/ /Ruiz/', 'SURN' => 'Garcia,Ruiz'],
 			$this->surname_tradition->newChildNames('Gabriel /Garcia/ /Iglesias/', 'Maria /Ruiz/ /Lorca/', 'M')
 		);
 	}
@@ -68,7 +68,7 @@ class SpanishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewDaughterNames() {
 		$this->assertSame(
-			array('NAME' => '/Garcia/ /Ruiz/', 'SURN' => 'Garcia,Ruiz'),
+			['NAME' => '/Garcia/ /Ruiz/', 'SURN' => 'Garcia,Ruiz'],
 			$this->surname_tradition->newChildNames('Gabriel /Garcia/ /Iglesias/', 'Maria /Ruiz/ /Lorca/', 'M')
 		);
 	}
@@ -80,7 +80,7 @@ class SpanishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNames() {
 		$this->assertSame(
-			array('NAME' => '/Garcia/ /Ruiz/', 'SURN' => 'Garcia,Ruiz'),
+			['NAME' => '/Garcia/ /Ruiz/', 'SURN' => 'Garcia,Ruiz'],
 			$this->surname_tradition->newChildNames('Gabriel /Garcia/ /Iglesias/', 'Maria /Ruiz/ /Lorca/', 'M')
 		);
 	}
@@ -92,7 +92,7 @@ class SpanishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNamesWithNoParentsNames() {
 		$this->assertSame(
-			array('NAME' => '// //', 'SURN' => ''),
+			['NAME' => '// //', 'SURN' => ''],
 			$this->surname_tradition->newChildNames('', '', 'U')
 		);
 	}
@@ -104,11 +104,11 @@ class SpanishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewChildNamesCompunds() {
 		$this->assertSame(
-			array('NAME' => '/Garcia/ /Ruiz/', 'SURN' => 'Garcia,Ruiz'),
+			['NAME' => '/Garcia/ /Ruiz/', 'SURN' => 'Garcia,Ruiz'],
 			$this->surname_tradition->newChildNames('Gabriel /Garcia Iglesias/', 'Maria /Ruiz Lorca/', 'M')
 		);
 		$this->assertSame(
-			array('NAME' => '/Garcia/ /Ruiz/', 'SURN' => 'Garcia,Ruiz'),
+			['NAME' => '/Garcia/ /Ruiz/', 'SURN' => 'Garcia,Ruiz'],
 			$this->surname_tradition->newChildNames('Gabriel /Garcia y Iglesias/', 'Maria /Ruiz y Lorca/', 'M')
 		);
 	}
@@ -120,7 +120,7 @@ class SpanishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewFatherNames() {
 		$this->assertSame(
-			array('NAME' => '/Garcia/ //', 'SURN' => 'Garcia'),
+			['NAME' => '/Garcia/ //', 'SURN' => 'Garcia'],
 			$this->surname_tradition->newParentNames('Gabriel /Garcia/ /Iglesias/', 'M')
 		);
 	}
@@ -132,7 +132,7 @@ class SpanishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewMotherNames() {
 		$this->assertSame(
-			array('NAME' => '/Iglesias/ //', 'SURN' => 'Iglesias'),
+			['NAME' => '/Iglesias/ //', 'SURN' => 'Iglesias'],
 			$this->surname_tradition->newParentNames('Gabriel /Garcia/ /Iglesias/', 'F')
 		);
 	}
@@ -144,7 +144,7 @@ class SpanishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewParentNames() {
 		$this->assertSame(
-			array('NAME' => '// //'),
+			['NAME' => '// //'],
 			$this->surname_tradition->newParentNames('Gabriel /Garcia/ /Iglesias/', 'U')
 		);
 	}
@@ -156,7 +156,7 @@ class SpanishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewHusbandNames() {
 		$this->assertSame(
-			array('NAME' => '// //'),
+			['NAME' => '// //'],
 			$this->surname_tradition->newSpouseNames('Maria /Ruiz/ /Lorca/', 'M')
 		);
 	}
@@ -168,7 +168,7 @@ class SpanishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewWifeNames() {
 		$this->assertSame(
-			array('NAME' => '// //'),
+			['NAME' => '// //'],
 			$this->surname_tradition->newSpouseNames('Gabriel /Garcia/ /Iglesias/', 'F')
 		);
 	}
@@ -180,7 +180,7 @@ class SpanishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testNewSpouseNames() {
 		$this->assertSame(
-			array('NAME' => '// //'),
+			['NAME' => '// //'],
 			$this->surname_tradition->newSpouseNames('Gabriel /Garcia/ /Iglesias/', 'U')
 		);
 	}