PSR-4

8 files changed, 46 insertions, 9 deletions

diff --git a/app/Theme/AdministrationTheme.php b/app/Theme/AdministrationTheme.php
index bf56c6caf8..ea3823e144 100644
--- a/app/Theme/AdministrationTheme.php
+++ b/app/Theme/AdministrationTheme.php
@@ -1,5 +1,5 @@
 <?php
-namespace Fisharebest\Webtrees;
+namespace Fisharebest\Webtrees\Theme;
 
 /**
  * webtrees: online genealogy
@@ -15,6 +15,10 @@ namespace Fisharebest\Webtrees;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+use Fisharebest\Webtrees\Auth;
+use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Menu;
+use Fisharebest\Webtrees\Tree;
 
 /**
  * Class AdministrationTheme - Theme for the control panel.
diff --git a/app/Theme/BaseTheme.php b/app/Theme/BaseTheme.php
index b81ded11ac..80dbd4397a 100644
--- a/app/Theme/BaseTheme.php
+++ b/app/Theme/BaseTheme.php
@@ -1,5 +1,5 @@
 <?php
-namespace Fisharebest\Webtrees;
+namespace Fisharebest\Webtrees\Theme;
 
 /**
  * webtrees: online genealogy
@@ -15,6 +15,25 @@ namespace Fisharebest\Webtrees;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+use Fisharebest\Webtrees\Auth;
+use Fisharebest\Webtrees\Controller\PageController;
+use Fisharebest\Webtrees\Database;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Filter;
+use Fisharebest\Webtrees\FlashMessages;
+use Fisharebest\Webtrees\GedcomRecord;
+use Fisharebest\Webtrees\GedcomTag;
+use Fisharebest\Webtrees\HitCounter;
+use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
+use Fisharebest\Webtrees\Menu;
+use Fisharebest\Webtrees\Module;
+use Fisharebest\Webtrees\Module\FamilyTreeFavoritesModule;
+use Fisharebest\Webtrees\Module\UserFavoritesModule;
+use Fisharebest\Webtrees\Site;
+use Fisharebest\Webtrees\Theme;
+use Fisharebest\Webtrees\Tree;
+use Fisharebest\Webtrees\User;
 
 /**
  * Class Base - Common functions and interfaces for all themes.
diff --git a/app/Theme/CloudsTheme.php b/app/Theme/CloudsTheme.php
index 2190a53853..2b12835573 100644
--- a/app/Theme/CloudsTheme.php
+++ b/app/Theme/CloudsTheme.php
@@ -1,5 +1,5 @@
 <?php
-namespace Fisharebest\Webtrees;
+namespace Fisharebest\Webtrees\Theme;
 
 /**
  * webtrees: online genealogy
@@ -15,6 +15,9 @@ namespace Fisharebest\Webtrees;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Menu;
+use Fisharebest\Webtrees\Theme;
 
 /**
  * Class CloudsTheme - The clouds theme.
diff --git a/app/Theme/ColorsTheme.php b/app/Theme/ColorsTheme.php
index 35805f2308..1e7539619d 100644
--- a/app/Theme/ColorsTheme.php
+++ b/app/Theme/ColorsTheme.php
@@ -1,5 +1,5 @@
 <?php
-namespace Fisharebest\Webtrees;
+namespace Fisharebest\Webtrees\Theme;
 
 /**
  * webtrees: online genealogy
@@ -15,6 +15,11 @@ namespace Fisharebest\Webtrees;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+use Fisharebest\Webtrees\Auth;
+use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Menu;
+use Fisharebest\Webtrees\Session;
+use Fisharebest\Webtrees\Site;
 
 /**
  * Class ColorsTheme - The colors theme.
@@ -74,7 +79,7 @@ class ColorsTheme extends CloudsTheme {
 			'shinytomato'      => /* I18N: The name of a colour-scheme */ I18N::translate('Shiny Tomato'),
 			'tealtop'          => /* I18N: The name of a colour-scheme */ I18N::translate('Teal Top'),
 		);
-		uasort($this->palettes, __NAMESPACE__ . '\I18N::strcasecmp');
+		uasort($this->palettes, '\Fisharebest\Webtrees\I18N;;strcasecmp');
 
 		// If we've selected a new palette, and we are logged in, set this value as a default.
 		if (isset($_GET['themecolor']) && array_key_exists($_GET['themecolor'], $this->palettes)) {
diff --git a/app/Theme/FabTheme.php b/app/Theme/FabTheme.php
index 8f80576e48..4d747bfe8d 100644
--- a/app/Theme/FabTheme.php
+++ b/app/Theme/FabTheme.php
@@ -1,5 +1,5 @@
 <?php
-namespace Fisharebest\Webtrees;
+namespace Fisharebest\Webtrees\Theme;
 
 /**
  * webtrees: online genealogy
@@ -15,6 +15,8 @@ namespace Fisharebest\Webtrees;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Menu;
 
 /**
  * Class FabTheme - The F.A.B. theme.
diff --git a/app/Theme/MinimalTheme.php b/app/Theme/MinimalTheme.php
index 2fcabbf7ca..c9876a6bd6 100644
--- a/app/Theme/MinimalTheme.php
+++ b/app/Theme/MinimalTheme.php
@@ -1,5 +1,5 @@
 <?php
-namespace Fisharebest\Webtrees;
+namespace Fisharebest\Webtrees\Theme;
 
 /**
  * webtrees: online genealogy
@@ -15,6 +15,7 @@ namespace Fisharebest\Webtrees;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+use Fisharebest\Webtrees\I18N;
 
 /**
  * Class MinimalTheme - The Minimal theme.
diff --git a/app/Theme/WebtreesTheme.php b/app/Theme/WebtreesTheme.php
index b96a94d53b..ef6f04f59c 100644
--- a/app/Theme/WebtreesTheme.php
+++ b/app/Theme/WebtreesTheme.php
@@ -1,5 +1,5 @@
 <?php
-namespace Fisharebest\Webtrees;
+namespace Fisharebest\Webtrees\Theme;
 
 /**
  * webtrees: online genealogy
@@ -15,6 +15,8 @@ namespace Fisharebest\Webtrees;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Theme;
 
 /**
  * Class WebtreesTheme - The webtrees (default) theme.
diff --git a/app/Theme/XeneaTheme.php b/app/Theme/XeneaTheme.php
index 9aea89d7c6..050575523c 100644
--- a/app/Theme/XeneaTheme.php
+++ b/app/Theme/XeneaTheme.php
@@ -1,5 +1,5 @@
 <?php
-namespace Fisharebest\Webtrees;
+namespace Fisharebest\Webtrees\Theme;
 
 /**
  * webtrees: online genealogy
@@ -15,6 +15,7 @@ namespace Fisharebest\Webtrees;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+use Fisharebest\Webtrees\I18N;
 
 /**
  * Class XeneaTheme - The xenea theme.