Namespaces should consist of both vendor and package

47 files changed, 64 insertions, 64 deletions

diff --git a/includes/config_data.php b/includes/config_data.php
index b4c322bd99..60e4d1239d 100644
--- a/includes/config_data.php
+++ b/includes/config_data.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_10_11.php b/includes/db_schema/db_schema_10_11.php
index 22e50dd9ac..c53e786aa0 100644
--- a/includes/db_schema/db_schema_10_11.php
+++ b/includes/db_schema/db_schema_10_11.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_11_12.php b/includes/db_schema/db_schema_11_12.php
index 792c239634..fcdf33582b 100644
--- a/includes/db_schema/db_schema_11_12.php
+++ b/includes/db_schema/db_schema_11_12.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_12_13.php b/includes/db_schema/db_schema_12_13.php
index 113950a8f9..f6b711a729 100644
--- a/includes/db_schema/db_schema_12_13.php
+++ b/includes/db_schema/db_schema_12_13.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_13_14.php b/includes/db_schema/db_schema_13_14.php
index b4d6d670e3..05e5ab37cc 100644
--- a/includes/db_schema/db_schema_13_14.php
+++ b/includes/db_schema/db_schema_13_14.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_14_15.php b/includes/db_schema/db_schema_14_15.php
index cee00aea10..9a4cdd0329 100644
--- a/includes/db_schema/db_schema_14_15.php
+++ b/includes/db_schema/db_schema_14_15.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_15_16.php b/includes/db_schema/db_schema_15_16.php
index 838100f0b9..e25f385e70 100644
--- a/includes/db_schema/db_schema_15_16.php
+++ b/includes/db_schema/db_schema_15_16.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_16_17.php b/includes/db_schema/db_schema_16_17.php
index 375c880a8d..405213ea64 100644
--- a/includes/db_schema/db_schema_16_17.php
+++ b/includes/db_schema/db_schema_16_17.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_17_18.php b/includes/db_schema/db_schema_17_18.php
index a2db0797d8..6bf850b80c 100644
--- a/includes/db_schema/db_schema_17_18.php
+++ b/includes/db_schema/db_schema_17_18.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_18_19.php b/includes/db_schema/db_schema_18_19.php
index ff377308f1..2a81cd5ae6 100644
--- a/includes/db_schema/db_schema_18_19.php
+++ b/includes/db_schema/db_schema_18_19.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_19_20.php b/includes/db_schema/db_schema_19_20.php
index d05d448062..b9394daf06 100644
--- a/includes/db_schema/db_schema_19_20.php
+++ b/includes/db_schema/db_schema_19_20.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_1_2.php b/includes/db_schema/db_schema_1_2.php
index 6496f8331c..4d7b0092c7 100644
--- a/includes/db_schema/db_schema_1_2.php
+++ b/includes/db_schema/db_schema_1_2.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_20_21.php b/includes/db_schema/db_schema_20_21.php
index e29c5cfa3e..d2ec1f6047 100644
--- a/includes/db_schema/db_schema_20_21.php
+++ b/includes/db_schema/db_schema_20_21.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_21_22.php b/includes/db_schema/db_schema_21_22.php
index 9851730a12..f754a2f7f6 100644
--- a/includes/db_schema/db_schema_21_22.php
+++ b/includes/db_schema/db_schema_21_22.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_22_23.php b/includes/db_schema/db_schema_22_23.php
index d8eea3c9f5..560a12c08b 100644
--- a/includes/db_schema/db_schema_22_23.php
+++ b/includes/db_schema/db_schema_22_23.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_23_24.php b/includes/db_schema/db_schema_23_24.php
index 6f3441f716..e8b287a1ec 100644
--- a/includes/db_schema/db_schema_23_24.php
+++ b/includes/db_schema/db_schema_23_24.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_24_25.php b/includes/db_schema/db_schema_24_25.php
index 00ea3a0cfc..dc222505cc 100644
--- a/includes/db_schema/db_schema_24_25.php
+++ b/includes/db_schema/db_schema_24_25.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_25_26.php b/includes/db_schema/db_schema_25_26.php
index dd6aaa871c..49b0f56a85 100644
--- a/includes/db_schema/db_schema_25_26.php
+++ b/includes/db_schema/db_schema_25_26.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_26_27.php b/includes/db_schema/db_schema_26_27.php
index fc168447c2..a272f9b94a 100644
--- a/includes/db_schema/db_schema_26_27.php
+++ b/includes/db_schema/db_schema_26_27.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_27_28.php b/includes/db_schema/db_schema_27_28.php
index fa10f5e743..e70622e678 100644
--- a/includes/db_schema/db_schema_27_28.php
+++ b/includes/db_schema/db_schema_27_28.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_28_29.php b/includes/db_schema/db_schema_28_29.php
index 01b7b204ef..3dafef6dd4 100644
--- a/includes/db_schema/db_schema_28_29.php
+++ b/includes/db_schema/db_schema_28_29.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_29_30.php b/includes/db_schema/db_schema_29_30.php
index d4dc080a9c..ff72ce7615 100644
--- a/includes/db_schema/db_schema_29_30.php
+++ b/includes/db_schema/db_schema_29_30.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_2_3.php b/includes/db_schema/db_schema_2_3.php
index d5dd3dd64d..0c22bd2397 100644
--- a/includes/db_schema/db_schema_2_3.php
+++ b/includes/db_schema/db_schema_2_3.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_3_4.php b/includes/db_schema/db_schema_3_4.php
index c0c9767f45..09aafe48a7 100644
--- a/includes/db_schema/db_schema_3_4.php
+++ b/includes/db_schema/db_schema_3_4.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_4_5.php b/includes/db_schema/db_schema_4_5.php
index 73833e7bc0..062b6f3000 100644
--- a/includes/db_schema/db_schema_4_5.php
+++ b/includes/db_schema/db_schema_4_5.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_5_6.php b/includes/db_schema/db_schema_5_6.php
index 80ef8daee5..6ec8f94939 100644
--- a/includes/db_schema/db_schema_5_6.php
+++ b/includes/db_schema/db_schema_5_6.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_6_7.php b/includes/db_schema/db_schema_6_7.php
index 9554b9356b..0f53bb9aec 100644
--- a/includes/db_schema/db_schema_6_7.php
+++ b/includes/db_schema/db_schema_6_7.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_7_8.php b/includes/db_schema/db_schema_7_8.php
index de6cc71c22..c345cda05c 100644
--- a/includes/db_schema/db_schema_7_8.php
+++ b/includes/db_schema/db_schema_7_8.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_8_9.php b/includes/db_schema/db_schema_8_9.php
index 5a2a1ff062..425c288445 100644
--- a/includes/db_schema/db_schema_8_9.php
+++ b/includes/db_schema/db_schema_8_9.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/db_schema/db_schema_9_10.php b/includes/db_schema/db_schema_9_10.php
index 269d86aa3e..65ebdc0f29 100644
--- a/includes/db_schema/db_schema_9_10.php
+++ b/includes/db_schema/db_schema_9_10.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/functions/functions.php b/includes/functions/functions.php
index b3a4932f66..e365992f31 100644
--- a/includes/functions/functions.php
+++ b/includes/functions/functions.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
@@ -313,8 +313,8 @@ function sort_facts(&$arr) {
 	}
 
 	//-- sort each type of array
-	usort($dated, 'Webtrees\Fact::compareDate');
-	usort($nondated, 'Webtrees\Fact::compareType');
+	usort($dated, __NAMESPACE__ . '\Fact::compareDate');
+	usort($nondated, __NAMESPACE__ . '\Fact::compareType');
 
 	//-- merge the arrays back together comparing by Facts
 	$dc = count($dated);
@@ -2356,7 +2356,7 @@ function get_theme_names() {
 			}
 		}
 		$d->close();
-		uksort($themes, 'Webtrees\I18N::strcasecmp');
+		uksort($themes, __NAMESPACE__ . '\I18N::strcasecmp');
 	}
 
 	return $themes;
diff --git a/includes/functions/functions_charts.php b/includes/functions/functions_charts.php
index 790cc92cf5..44ce0fc27c 100644
--- a/includes/functions/functions_charts.php
+++ b/includes/functions/functions_charts.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/functions/functions_date.php b/includes/functions/functions_date.php
index dbf1aefed9..e73581a481 100644
--- a/includes/functions/functions_date.php
+++ b/includes/functions/functions_date.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/functions/functions_db.php b/includes/functions/functions_db.php
index aab5b0e2ce..284329187c 100644
--- a/includes/functions/functions_db.php
+++ b/includes/functions/functions_db.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
@@ -86,7 +86,7 @@ function get_source_list($ged_id) {
 	foreach ($rows as $row) {
 		$list[] = Source::getInstance($row->xref, $row->gedcom_id, $row->gedcom);
 	}
-	usort($list, 'Webtrees\GedcomRecord::compare');
+	usort($list, __NAMESPACE__ . '\GedcomRecord::compare');
 	return $list;
 }
 
@@ -107,7 +107,7 @@ function get_repo_list($ged_id) {
 	foreach ($rows as $row) {
 		$list[] = Repository::getInstance($row->xref, $row->gedcom_id, $row->gedcom);
 	}
-	usort($list, 'Webtrees\GedcomRecord::compare');
+	usort($list, __NAMESPACE__ . '\GedcomRecord::compare');
 	return $list;
 }
 
@@ -128,7 +128,7 @@ function get_note_list($ged_id) {
 	foreach ($rows as $row) {
 		$list[] = Note::getInstance($row->xref, $row->gedcom_id, $row->gedcom);
 	}
-	usort($list, 'Webtrees\GedcomRecord::compare');
+	usort($list, __NAMESPACE__ . '\GedcomRecord::compare');
 	return $list;
 }
 
@@ -827,7 +827,7 @@ function get_common_surnames($min) {
 	if (empty($topsurns) && $min > 2) {
 		return get_common_surnames($min / 2);
 	} else {
-		uksort($topsurns, 'Webtrees\I18N::strcasecmp');
+		uksort($topsurns, __NAMESPACE__ . '\I18N::strcasecmp');
 		foreach ($topsurns as $key => $value) {
 			$topsurns[$key] = array('name' => $key, 'match' => $value);
 		}
diff --git a/includes/functions/functions_edit.php b/includes/functions/functions_edit.php
index e441573e55..5c7b3b69cd 100644
--- a/includes/functions/functions_edit.php
+++ b/includes/functions/functions_edit.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/functions/functions_export.php b/includes/functions/functions_export.php
index ce9254a729..08eb1a6fcf 100644
--- a/includes/functions/functions_export.php
+++ b/includes/functions/functions_export.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/functions/functions_import.php b/includes/functions/functions_import.php
index cd793dc45e..65a8b723cf 100644
--- a/includes/functions/functions_import.php
+++ b/includes/functions/functions_import.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/functions/functions_mediadb.php b/includes/functions/functions_mediadb.php
index 142208e102..382fed9e52 100644
--- a/includes/functions/functions_mediadb.php
+++ b/includes/functions/functions_mediadb.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php
index e2dc46801e..0474455bd7 100644
--- a/includes/functions/functions_print.php
+++ b/includes/functions/functions_print.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/functions/functions_print_facts.php b/includes/functions/functions_print_facts.php
index 5bb32bb73d..738b354239 100644
--- a/includes/functions/functions_print_facts.php
+++ b/includes/functions/functions_print_facts.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/functions/functions_print_lists.php b/includes/functions/functions_print_lists.php
index cfd6db2d4b..5d6dff1ed6 100644
--- a/includes/functions/functions_print_lists.php
+++ b/includes/functions/functions_print_lists.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
@@ -1738,14 +1738,14 @@ function print_changes_list($change_ids, $sort) {
 
 	switch ($sort) {
 	case 'name':
-		uasort($arr, 'Webtrees\event_sort_name');
+		uasort($arr, __NAMESPACE__ . '\event_sort_name');
 		break;
 	case 'date_asc':
-		uasort($arr, 'Webtrees\event_sort');
+		uasort($arr, __NAMESPACE__ . '\event_sort');
 		$arr = array_reverse($arr);
 		break;
 	case 'date_desc':
-		uasort($arr, 'Webtrees\event_sort');
+		uasort($arr, __NAMESPACE__ . '\event_sort');
 	}
 	$html = '';
 	foreach ($arr as $value) {
diff --git a/includes/functions/functions_rtl.php b/includes/functions/functions_rtl.php
index e72b2f3eea..9e3cbd51d0 100644
--- a/includes/functions/functions_rtl.php
+++ b/includes/functions/functions_rtl.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/hitcount.php b/includes/hitcount.php
index a2a545ce89..a938f8c3a7 100644
--- a/includes/hitcount.php
+++ b/includes/hitcount.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/php_53_compatibility.php b/includes/php_53_compatibility.php
index cdceaded73..2b36a02f41 100644
--- a/includes/php_53_compatibility.php
+++ b/includes/php_53_compatibility.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/reportheader.php b/includes/reportheader.php
index 5646fab7b8..3f90dd770f 100644
--- a/includes/reportheader.php
+++ b/includes/reportheader.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
@@ -23,13 +23,13 @@ namespace Webtrees;
  * @global array $elementHandler
  */
 $elementHandler = array();
-$elementHandler['Report']['start']   = '\\Webtrees\\reportStartHandler';
-$elementHandler['var']['start']      = '\\Webtrees\\varStartHandler';
-$elementHandler['Title']['start']    = '\\Webtrees\\titleStartHandler';
-$elementHandler['Title']['end']      = '\\Webtrees\\titleEndHandler';
-$elementHandler['Description']['end'] = '\\Webtrees\\descriptionEndHandler';
-$elementHandler['Input']['start']    = '\\Webtrees\\inputStartHandler';
-$elementHandler['Input']['end']      = '\\Webtrees\\inputEndHandler';
+$elementHandler['Report']['start']   = __NAMESPACE__ . '\\reportStartHandler';
+$elementHandler['var']['start']      = __NAMESPACE__ . '\\varStartHandler';
+$elementHandler['Title']['start']    = __NAMESPACE__ . '\\titleStartHandler';
+$elementHandler['Title']['end']      = __NAMESPACE__ . '\\titleEndHandler';
+$elementHandler['Description']['end'] = __NAMESPACE__ . '\\descriptionEndHandler';
+$elementHandler['Input']['start']    = __NAMESPACE__ . '\\inputStartHandler';
+$elementHandler['Input']['end']      = __NAMESPACE__ . '\\inputEndHandler';
 
 $text = "";
 $report_array = array();
diff --git a/includes/session.php b/includes/session.php
index 36ea9bb77f..719023cef9 100644
--- a/includes/session.php
+++ b/includes/session.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy
diff --git a/includes/specialchars.php b/includes/specialchars.php
index a00848571c..6b450f6926 100644
--- a/includes/specialchars.php
+++ b/includes/specialchars.php
@@ -1,5 +1,5 @@
 <?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
 
 /**
  * webtrees: online genealogy