From 5fdb5c9d6f1437ae95ff1f3aa966c8581c15f6d1 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 18 Sep 2014 13:58:24 +0200
Subject: [PATCH] Some cleanup

---
 .../lib/acp/form/PaidSubscriptionAddForm.class.php     |  6 +++---
 .../lib/acp/form/PaidSubscriptionEditForm.class.php    |  4 ++--
 .../lib/acp/form/PaidSubscriptionUserAddForm.class.php | 10 +++++-----
 .../PaidSubscriptionTransactionLogListPage.class.php   |  2 +-
 .../data/paid/subscription/PaidSubscription.class.php  |  2 +-
 .../log/PaidSubscriptionTransactionLog.class.php       |  2 +-
 .../user/PaidSubscriptionUserAction.class.php          |  2 +-
 .../files/lib/page/PaidSubscriptionListPage.class.php  |  2 +-
 .../lib/page/PaidSubscriptionReturnPage.class.php      |  4 ++--
 .../lib/system/cronjob/HourlyCleanUpCronjob.class.php  |  2 +-
 .../option/PaymentMethodSelectOptionType.class.php     |  2 +-
 .../system/package/PackageUpdateDispatcher.class.php   |  1 -
 .../payment/method/PaypalPaymentMethod.class.php       |  2 +-
 .../system/payment/type/AbstractPaymentType.class.php  |  2 +-
 .../lib/system/payment/type/IPaymentType.class.php     |  2 +-
 .../payment/type/PaidSubscriptionPaymentType.class.php |  2 +-
 16 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionAddForm.class.php b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionAddForm.class.php
index a48d7c590c..0295ad7f00 100644
--- a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionAddForm.class.php
@@ -1,8 +1,9 @@
 <?php
 namespace wcf\acp\form;
-use wcf\data\paid\subscription\PaidSubscriptionAction;
 use wcf\data\paid\subscription\PaidSubscription;
+use wcf\data\paid\subscription\PaidSubscriptionAction;
 use wcf\data\paid\subscription\PaidSubscriptionEditor;
+use wcf\data\paid\subscription\PaidSubscriptionList;
 use wcf\data\user\group\UserGroup;
 use wcf\form\AbstractForm;
 use wcf\system\exception\UserInputException;
@@ -10,7 +11,6 @@ use wcf\system\language\I18nHandler;
 use wcf\system\payment\method\PaymentMethodHandler;
 use wcf\system\WCF;
 use wcf\util\ArrayUtil;
-use wcf\data\paid\subscription\PaidSubscriptionList;
 
 /**
  * Shows the paid subscription add form.
@@ -35,7 +35,7 @@ class PaidSubscriptionAddForm extends AbstractForm {
 	
 	/**
 	 * @see	\wcf\page\AbstractPage::$templateName
-	*/
+	 */
 	public $templateName = 'paidSubscriptionAdd';
 	
 	/**
diff --git a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionEditForm.class.php b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionEditForm.class.php
index d2a04aa13a..f1d4b6b7ad 100644
--- a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionEditForm.class.php
@@ -1,13 +1,13 @@
 <?php
 namespace wcf\acp\form;
 use wcf\form\AbstractForm;
-use wcf\data\paid\subscription\PaidSubscriptionAction;
 use wcf\data\paid\subscription\PaidSubscription;
+use wcf\data\paid\subscription\PaidSubscriptionAction;
+use wcf\data\paid\subscription\PaidSubscriptionList;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\language\I18nHandler;
 use wcf\system\WCF;
 use wcf\util\ArrayUtil;
-use wcf\data\paid\subscription\PaidSubscriptionList;
 
 /**
  * Shows the paid subscription edit form.
diff --git a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionUserAddForm.class.php b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionUserAddForm.class.php
index f5671118cf..e4433419c3 100644
--- a/wcfsetup/install/files/lib/acp/form/PaidSubscriptionUserAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PaidSubscriptionUserAddForm.class.php
@@ -1,15 +1,15 @@
 <?php
 namespace wcf\acp\form;
+use wcf\data\paid\subscription\user\PaidSubscriptionUser;
+use wcf\data\paid\subscription\user\PaidSubscriptionUserAction;
 use wcf\data\paid\subscription\PaidSubscription;
+use wcf\data\user\User;
 use wcf\form\AbstractForm;
+use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
-use wcf\system\exception\PermissionDeniedException;
-use wcf\util\StringUtil;
-use wcf\data\user\User;
-use wcf\data\paid\subscription\user\PaidSubscriptionUser;
-use wcf\data\paid\subscription\user\PaidSubscriptionUserAction;
 use wcf\util\DateUtil;
+use wcf\util\StringUtil;
 
 /**
  * Shows the user subscription add form.
diff --git a/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogListPage.class.php b/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogListPage.class.php
index dc80fddade..f10a24869a 100644
--- a/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogListPage.class.php
@@ -2,8 +2,8 @@
 namespace wcf\acp\page;
 use wcf\page\SortablePage;
 use wcf\util\StringUtil;
-use wcf\system\WCF;
 use wcf\system\cache\builder\PaidSubscriptionCacheBuilder;
+use wcf\system\WCF;
 
 /**
  * Shows the list of paid subscription transactions.
diff --git a/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscription.class.php b/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscription.class.php
index ca0883aaed..dcd7ccfd32 100644
--- a/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscription.class.php
+++ b/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscription.class.php
@@ -42,7 +42,7 @@ class PaidSubscription extends DatabaseObject {
 			// check supported currencies
 			if (!in_array($this->currency, $paymentMethod->getSupportedCurrencies())) continue;
 			
-			$buttons[] = $paymentMethod->getPurchaseButton($this->cost, $this->currency, WCF::getLanguage()->get($this->title), $objectTypeID . ':' . WCF::getUser()->userID . ':' . $this->subscriptionID , LinkHandler::getInstance()->getLink('PaidSubscriptionReturn'), LinkHandler::getInstance()->getLink(), $this->isRecurring, $this->subscriptionLength, $this->subscriptionLengthUnit);
+			$buttons[] = $paymentMethod->getPurchaseButton($this->cost, $this->currency, WCF::getLanguage()->get($this->title), $objectTypeID . ':' . WCF::getUser()->userID . ':' . $this->subscriptionID, LinkHandler::getInstance()->getLink('PaidSubscriptionReturn'), LinkHandler::getInstance()->getLink(), $this->isRecurring, $this->subscriptionLength, $this->subscriptionLengthUnit);
 		}
 		
 		return $buttons;
diff --git a/wcfsetup/install/files/lib/data/paid/subscription/transaction/log/PaidSubscriptionTransactionLog.class.php b/wcfsetup/install/files/lib/data/paid/subscription/transaction/log/PaidSubscriptionTransactionLog.class.php
index c9503b9f46..2f72294a5e 100644
--- a/wcfsetup/install/files/lib/data/paid/subscription/transaction/log/PaidSubscriptionTransactionLog.class.php
+++ b/wcfsetup/install/files/lib/data/paid/subscription/transaction/log/PaidSubscriptionTransactionLog.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\data\paid\subscription\transaction\log;
-use wcf\data\DatabaseObject;
 use wcf\data\object\type\ObjectTypeCache;
 use wcf\data\paid\subscription\PaidSubscription;
 use wcf\data\user\User;
+use wcf\data\DatabaseObject;
 use wcf\system\WCF;
 
 /**
diff --git a/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUserAction.class.php b/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUserAction.class.php
index cfc5c4dd3d..caa3ecbff9 100644
--- a/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUserAction.class.php
+++ b/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUserAction.class.php
@@ -2,8 +2,8 @@
 namespace wcf\data\paid\subscription\user;
 use wcf\data\paid\subscription\PaidSubscription;
 use wcf\data\user\group\UserGroup;
-use wcf\data\user\UserAction;
 use wcf\data\user\User;
+use wcf\data\user\UserAction;
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\system\exception\UserInputException;
 use wcf\util\DateUtil;
diff --git a/wcfsetup/install/files/lib/page/PaidSubscriptionListPage.class.php b/wcfsetup/install/files/lib/page/PaidSubscriptionListPage.class.php
index f9aa379583..21e4870eeb 100644
--- a/wcfsetup/install/files/lib/page/PaidSubscriptionListPage.class.php
+++ b/wcfsetup/install/files/lib/page/PaidSubscriptionListPage.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\page;
+use wcf\data\paid\subscription\user\PaidSubscriptionUserList;
 use wcf\system\cache\builder\PaidSubscriptionCacheBuilder;
 use wcf\system\menu\user\UserMenu;
 use wcf\system\WCF;
-use wcf\data\paid\subscription\user\PaidSubscriptionUserList;
 
 /**
  * Shows a list of the available paid subscriptions.
diff --git a/wcfsetup/install/files/lib/page/PaidSubscriptionReturnPage.class.php b/wcfsetup/install/files/lib/page/PaidSubscriptionReturnPage.class.php
index d6ff4f6b3d..eade0a880d 100644
--- a/wcfsetup/install/files/lib/page/PaidSubscriptionReturnPage.class.php
+++ b/wcfsetup/install/files/lib/page/PaidSubscriptionReturnPage.class.php
@@ -12,7 +12,7 @@ use wcf\system\WCF;
  * @subpackage	page
  * @category	Community Framework
  */
-class PaidSubscriptionReturn extends AbstractPage {
+class PaidSubscriptionReturnPage extends AbstractPage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$templateName
 	 */
@@ -28,4 +28,4 @@ class PaidSubscriptionReturn extends AbstractPage {
 			'message' => WCF::getLanguage()->get('wcf.paidSubscription.returnMessage')
 		));
 	}
-}
\ No newline at end of file
+}
diff --git a/wcfsetup/install/files/lib/system/cronjob/HourlyCleanUpCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/HourlyCleanUpCronjob.class.php
index 3848acce94..8835bd8ea3 100644
--- a/wcfsetup/install/files/lib/system/cronjob/HourlyCleanUpCronjob.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/HourlyCleanUpCronjob.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\cronjob;
 use wcf\data\cronjob\Cronjob;
-use wcf\data\paid\subscription\user\PaidSubscriptionUserList;
 use wcf\data\paid\subscription\user\PaidSubscriptionUserAction;
+use wcf\data\paid\subscription\user\PaidSubscriptionUserList;
 
 /**
  * Cronjob for a hourly system cleanup.
diff --git a/wcfsetup/install/files/lib/system/option/PaymentMethodSelectOptionType.class.php b/wcfsetup/install/files/lib/system/option/PaymentMethodSelectOptionType.class.php
index 082c3d850f..542a935460 100644
--- a/wcfsetup/install/files/lib/system/option/PaymentMethodSelectOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/PaymentMethodSelectOptionType.class.php
@@ -2,8 +2,8 @@
 namespace wcf\system\option;
 use wcf\data\option\Option;
 use wcf\system\exception\UserInputException;
-use wcf\system\WCF;
 use wcf\system\payment\method\PaymentMethodHandler;
+use wcf\system\WCF;
 
 /**
  * Option type implementation for selecting payment methods.
diff --git a/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
index 602ca971bb..8b62682173 100644
--- a/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
@@ -16,7 +16,6 @@ use wcf\system\SingletonFactory;
 use wcf\system\WCF;
 use wcf\util\HTTPRequest;
 use wcf\util\XML;
-use wcf\data\package\update\PackageUpdate;
 
 /**
  * Provides functions to manage package updates.
diff --git a/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php b/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php
index 6d05a56416..bf2b11b227 100644
--- a/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php
+++ b/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php
@@ -106,4 +106,4 @@ class PaypalPaymentMethod extends AbstractPaymentMethod {
 				</form>';
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/wcfsetup/install/files/lib/system/payment/type/AbstractPaymentType.class.php b/wcfsetup/install/files/lib/system/payment/type/AbstractPaymentType.class.php
index 389f83a7a2..1428ddcd67 100644
--- a/wcfsetup/install/files/lib/system/payment/type/AbstractPaymentType.class.php
+++ b/wcfsetup/install/files/lib/system/payment/type/AbstractPaymentType.class.php
@@ -11,4 +11,4 @@ namespace wcf\system\payment\type;
  * @subpackage	system.payment.type
  * @category	Community Framework
  */
-abstract class AbstractPaymentType implements IPaymentType {}
\ No newline at end of file
+abstract class AbstractPaymentType implements IPaymentType {}
diff --git a/wcfsetup/install/files/lib/system/payment/type/IPaymentType.class.php b/wcfsetup/install/files/lib/system/payment/type/IPaymentType.class.php
index f5034f6757..9d894c4475 100644
--- a/wcfsetup/install/files/lib/system/payment/type/IPaymentType.class.php
+++ b/wcfsetup/install/files/lib/system/payment/type/IPaymentType.class.php
@@ -24,4 +24,4 @@ interface IPaymentType {
 	 * @param	array		$transactionDetails
 	 */
 	public function processTransaction($paymentMethodObjectTypeID, $token, $amount, $currency, $transactionID, $status, $transactionDetails);
-}
\ No newline at end of file
+}
diff --git a/wcfsetup/install/files/lib/system/payment/type/PaidSubscriptionPaymentType.class.php b/wcfsetup/install/files/lib/system/payment/type/PaidSubscriptionPaymentType.class.php
index 2eb88ef3e1..f48fea916a 100644
--- a/wcfsetup/install/files/lib/system/payment/type/PaidSubscriptionPaymentType.class.php
+++ b/wcfsetup/install/files/lib/system/payment/type/PaidSubscriptionPaymentType.class.php
@@ -122,4 +122,4 @@ class PaidSubscriptionPaymentType extends AbstractPaymentType {
 			throw $e;
 		}
 	}
-}
\ No newline at end of file
+}
-- 
2.20.1