From 7a3b0ca370ccff31e4489b0de244a9ea3347a72c Mon Sep 17 00:00:00 2001
From: Hereward Mills <hereward.mills@softwire.com>
Date: Fri, 4 Dec 2015 08:34:02 +0000
Subject: [PATCH] TidyUp: Remove unnecessary imports.

---
 CRM/Contribute/Form/ContributionBase.php                      | 2 --
 CRM/Core/Payment.php                                          | 2 +-
 CRM/Core/Payment/ProcessorForm.php                            | 2 +-
 Civi/Token/TokenRow.php                                       | 1 -
 tests/phpunit/Civi/API/Subscriber/WhitelistSubscriberTest.php | 1 -
 tests/phpunit/CiviTest/CiviUnitTestCase.php                   | 4 ++--
 6 files changed, 4 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 CRM/Contribute/Form/ContributionBase.php
 mode change 100644 => 100755 CRM/Core/Payment.php
 mode change 100644 => 100755 CRM/Core/Payment/ProcessorForm.php
 mode change 100644 => 100755 Civi/Token/TokenRow.php
 mode change 100644 => 100755 tests/phpunit/Civi/API/Subscriber/WhitelistSubscriberTest.php

diff --git a/CRM/Contribute/Form/ContributionBase.php b/CRM/Contribute/Form/ContributionBase.php
old mode 100644
new mode 100755
index 1f11cabdea..753e275e4d
--- a/CRM/Contribute/Form/ContributionBase.php
+++ b/CRM/Contribute/Form/ContributionBase.php
@@ -31,8 +31,6 @@
  * @copyright CiviCRM LLC (c) 2004-2015
  */
 
-use Civi\Payment\System;
-
 /**
  * This class generates form components for processing a contribution.
  */
diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php
old mode 100644
new mode 100755
index db6a77f1e9..3907f6a833
--- a/CRM/Core/Payment.php
+++ b/CRM/Core/Payment.php
@@ -1095,7 +1095,7 @@ abstract class CRM_Core_Payment {
         require_once $ext->classToPath($paymentClass);
       }
 
-      $processorInstance = Civi\Payment\System::singleton()->getById($dao->processor_id);
+      $processorInstance = System::singleton()->getById($dao->processor_id);
 
       // Should never be empty - we already established this processor_id exists and is active.
       if (empty($processorInstance)) {
diff --git a/CRM/Core/Payment/ProcessorForm.php b/CRM/Core/Payment/ProcessorForm.php
old mode 100644
new mode 100755
index dd493be0bc..b63d964646
--- a/CRM/Core/Payment/ProcessorForm.php
+++ b/CRM/Core/Payment/ProcessorForm.php
@@ -62,7 +62,7 @@ class CRM_Core_Payment_ProcessorForm {
       return;
     }
     $form->set('paymentProcessor', $form->_paymentProcessor);
-    $form->_paymentObject = Civi\Payment\System::singleton()->getByProcessor($form->_paymentProcessor);
+    $form->_paymentObject = System::singleton()->getByProcessor($form->_paymentProcessor);
 
     $form->assign('suppressSubmitButton', $form->_paymentObject->isSuppressSubmitButtons());
 
diff --git a/Civi/Token/TokenRow.php b/Civi/Token/TokenRow.php
old mode 100644
new mode 100755
index 02d744eba0..55f509b723
--- a/Civi/Token/TokenRow.php
+++ b/Civi/Token/TokenRow.php
@@ -1,6 +1,5 @@
 <?php
 namespace Civi\Token;
-use Civi\Token\Event\TokenRenderEvent;
 
 /**
  * Class TokenRow
diff --git a/tests/phpunit/Civi/API/Subscriber/WhitelistSubscriberTest.php b/tests/phpunit/Civi/API/Subscriber/WhitelistSubscriberTest.php
old mode 100644
new mode 100755
index 9cfc9e3eb5..bbc8b91027
--- a/tests/phpunit/Civi/API/Subscriber/WhitelistSubscriberTest.php
+++ b/tests/phpunit/Civi/API/Subscriber/WhitelistSubscriberTest.php
@@ -3,7 +3,6 @@ namespace Civi\API\Subscriber;
 
 use Civi\API\Kernel;
 use Civi\API\WhitelistRule;
-use Civi\Core\Container;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
 require_once 'CiviTest/CiviUnitTestCase.php';
diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index 1400c9bdff..b6faa510b6 100755
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -1519,7 +1519,7 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase {
    */
   public function dummyProcessorCreate($processorParams = array()) {
     $paymentProcessorID = $this->processorCreate($processorParams);
-    return Civi\Payment\System::singleton()->getById($paymentProcessorID);
+    return System::singleton()->getById($paymentProcessorID);
   }
 
   /**
@@ -2603,7 +2603,7 @@ AND    ( TABLE_NAME LIKE 'civicrm_value_%' )
     $this->restoreDefaultPriceSetConfig();
     $var = TRUE;
     CRM_Member_BAO_Membership::createRelatedMemberships($var, $var, TRUE);
-    Civi\Payment\System::singleton()->flushProcessors();
+    System::singleton()->flushProcessors();
   }
 
   public function restoreDefaultPriceSetConfig() {
-- 
2.25.1