From 898fe2db1e41ab2401f43e38146e3409d11852b3 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 19 Nov 2017 17:06:18 -0500
Subject: [PATCH] Code cleanup

- Remove extraneous use statements
- Format require_once
---
 include/contact_widgets.php      | 1 -
 mod/admin.php                    | 6 +++---
 mod/cal.php                      | 4 ++--
 mod/crepair.php                  | 4 ++--
 src/Model/GlobalContact.php      | 2 +-
 src/Protocol/PortableContact.php | 3 ---
 src/Worker/Expire.php            | 4 ++--
 src/Worker/Notifier.php          | 1 -
 8 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 036504a4f5..5108eaf723 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -1,6 +1,5 @@
 <?php
 
-use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
diff --git a/mod/admin.php b/mod/admin.php
index 7a7ca14103..28f890bb58 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -13,9 +13,9 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\User;
 
-require_once("include/enotify.php");
-require_once("include/text.php");
-require_once('include/items.php');
+require_once 'include/enotify.php';
+require_once 'include/text.php';
+require_once 'include/items.php';
 
 /**
  * @brief Process send data from the admin panels subpages
diff --git a/mod/cal.php b/mod/cal.php
index 96a1c8f293..170e7ea4c2 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -13,8 +13,8 @@ use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Object\Contact;
 
-require_once('include/event.php');
-require_once('include/redir.php');
+require_once 'include/event.php';
+require_once 'include/redir.php';
 
 function cal_init(App $a) {
 	if($a->argc > 1)
diff --git a/mod/crepair.php b/mod/crepair.php
index 69efad24b0..754078316f 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -5,8 +5,8 @@ use Friendica\Core\Config;
 use Friendica\Database\DBM;
 use Friendica\Object\Contact;
 
-require_once("include/contact_selectors.php");
-require_once("mod/contacts.php");
+require_once 'include/contact_selectors.php';
+require_once 'mod/contacts.php';
 
 function crepair_init(App $a) {
 	if (! local_user()) {
diff --git a/src/Model/GlobalContact.php b/src/Model/GlobalContact.php
index e73bfb9075..67fe27e8e5 100644
--- a/src/Model/GlobalContact.php
+++ b/src/Model/GlobalContact.php
@@ -381,7 +381,7 @@ class GlobalContact
 		if (DBM::is_result($r)) {
 			return $r[0]['total'];
 		}
-		
+
 		return 0;
 	}
 
diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 6bd1750101..59b3ad4325 100644
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -9,9 +9,6 @@
 
 namespace Friendica\Protocol;
 
-use Friendica\App;
-use Friendica\Core\System;
-use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index 1485f3570f..61326fa88e 100644
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -15,8 +15,8 @@ class Expire {
 	public static function execute($param = '', $hook_name = '') {
 		global $a;
 
-		require_once('include/datetime.php');
-		require_once('include/items.php');
+		require_once 'include/datetime.php';
+		require_once 'include/items.php';
 
 		load_hooks();
 
diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 142bf866d0..f3096e41a1 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -4,7 +4,6 @@
  */
 namespace Friendica\Worker;
 
-use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;