pronamic / wp-pronamic-ideal

classes/CreditCard.php

Spacing +6 added lines, -6 removed lines

@@ -75,7 +75,7 @@ 
 	 *
 	 * @param string $number Number.
 	 */
-	public function set_number( $number ) {
+	public function set_number($number) {
 		$this->number = $number;
 	}
 
@@ -93,7 +93,7 @@ 
 	 *
 	 * @param int $month Month.
 	 */
-	public function set_expiration_month( $month ) {
+	public function set_expiration_month($month) {
 		$this->expiration_month = $month;
 	}
 
@@ -111,7 +111,7 @@ 
 	 *
 	 * @param int $year Year.
 	 */
-	public function set_expiration_year( $year ) {
+	public function set_expiration_year($year) {
 		$this->expiration_year = $year;
 	}
 
@@ -121,7 +121,7 @@ 
 	 * @return DateTime
 	 */
 	public function get_expiration_date() {
-		return new DateTime( '@' . gmmktime( 0, 0, 0, $this->expiration_month, 1, $this->expiration_year ) );
+		return new DateTime('@' . gmmktime(0, 0, 0, $this->expiration_month, 1, $this->expiration_year));
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 	 *
 	 * @param int $security_code Security code.
 	 */
-	public function set_security_code( $security_code ) {
+	public function set_security_code($security_code) {
 		$this->security_code = $security_code;
 	}
 
@@ -156,7 +156,7 @@ 
 	 *
 	 * @param string $name Name.
 	 */
-	public function set_name( $name ) {
+	public function set_name($name) {
 		$this->name = $name;
 	}
 }

classes/Settings.php

Spacing +15 added lines, -15 removed lines

@@ -29,13 +29,13 @@ 
 	 *
 	 * @param Plugin $plugin The plugin.
 	 */
-	public function __construct( $plugin ) {
+	public function __construct($plugin) {
 		$this->plugin = $plugin;
 
 		// Actions.
-		add_action( 'load-options.php', array( $this, 'load_options_dont_trim_all_posted_values' ) );
+		add_action('load-options.php', array($this, 'load_options_dont_trim_all_posted_values'));
 
-		add_action( 'init', array( $this, 'init' ) );
+		add_action('init', array($this, 'init'));
 	}
 
 	/**
@@ -51,8 +51,8 @@ 
 			'pronamic_pay_decimal_sep',
 		);
 
-		foreach ( $no_trim_options as $option ) {
-			add_filter( 'sanitize_option_' . $option, array( $this, 'sanitize_option_dont_trim_posted_value' ), 10, 2 );
+		foreach ($no_trim_options as $option) {
+			add_filter('sanitize_option_' . $option, array($this, 'sanitize_option_dont_trim_posted_value'), 10, 2);
 		}
 	}
 
@@ -63,17 +63,17 @@ 
 	 * @param string $option The option name to sanitize.
 	 * @return string
 	 */
-	public function sanitize_option_dont_trim_posted_value( $value, $option ) {
+	public function sanitize_option_dont_trim_posted_value($value, $option) {
 		$screen = get_current_screen();
 
-		if ( 'options' !== $screen->id ) {
+		if ('options' !== $screen->id) {
 			return $value;
 		}
 
 		// @see https://github.com/WordPress/WordPress/blob/4.9/wp-admin/options.php#L203-L214
-		if ( isset( $_POST[ $option ] ) ) { // WPCS: CSRF ok.
-			$value = $_POST[ $option ]; // WPCS: CSRF ok.
-			$value = wp_unslash( $value );
+		if (isset($_POST[$option])) { // WPCS: CSRF ok.
+			$value = $_POST[$option]; // WPCS: CSRF ok.
+			$value = wp_unslash($value);
 		}
 
 		return $value;
@@ -100,7 +100,7 @@ 
 		register_setting(
 			'pronamic_pay', 'pronamic_pay_config_id', array(
 				'type'              => 'integer',
-				'sanitize_callback' => array( $this, 'sanitize_published_post_id' ),
+				'sanitize_callback' => array($this, 'sanitize_published_post_id'),
 			)
 		);
 
@@ -144,11 +144,11 @@ 
 			)
 		);
 
-		foreach ( $this->plugin->get_pages() as $id => $label ) {
+		foreach ($this->plugin->get_pages() as $id => $label) {
 			register_setting(
 				'pronamic_pay', $id, array(
 					'type'              => 'integer',
-					'sanitize_callback' => array( $this, 'sanitize_published_post_id' ),
+					'sanitize_callback' => array($this, 'sanitize_published_post_id'),
 				)
 			);
 		}
@@ -160,8 +160,8 @@ 
 	 * @param string $value Check if the value is published post ID.
 	 * @return boolean True if post status is publish, false otherwise.
 	 */
-	public function sanitize_published_post_id( $value ) {
-		if ( 'publish' === get_post_status( $value ) ) {
+	public function sanitize_published_post_id($value) {
+		if ('publish' === get_post_status($value)) {
 			return $value;
 		}
 

classes/Subscriptions/SubscriptionPostType.php

Spacing +30 added lines, -30 removed lines

@@ -32,8 +32,8 @@ 
 		 *
 		 * @see https://github.com/WordPress/WordPress/blob/4.0/wp-includes/post.php#L167
 		 */
-		add_action( 'init', array( $this, 'register_subscription_post_type' ), 0 ); // Highest priority.
-		add_action( 'init', array( $this, 'register_post_status' ), 9 );
+		add_action('init', array($this, 'register_subscription_post_type'), 0); // Highest priority.
+		add_action('init', array($this, 'register_post_status'), 9);
 	}
 
 	/**
@@ -44,23 +44,23 @@ 
 	public function register_subscription_post_type() {
 		register_post_type(
 			'pronamic_pay_subscr', array(
-				'label'              => __( 'Subscriptions', 'pronamic_ideal' ),
+				'label'              => __('Subscriptions', 'pronamic_ideal'),
 				'labels'             => array(
-					'name'                  => __( 'Subscriptions', 'pronamic_ideal' ),
-					'singular_name'         => __( 'Subscription', 'pronamic_ideal' ),
-					'add_new'               => __( 'Add New', 'pronamic_ideal' ),
-					'add_new_item'          => __( 'Add New Subscription', 'pronamic_ideal' ),
-					'edit_item'             => __( 'Edit Subscription', 'pronamic_ideal' ),
-					'new_item'              => __( 'New Subscription', 'pronamic_ideal' ),
-					'all_items'             => __( 'All Subscriptions', 'pronamic_ideal' ),
-					'view_item'             => __( 'View Subscription', 'pronamic_ideal' ),
-					'search_items'          => __( 'Search Subscriptions', 'pronamic_ideal' ),
-					'not_found'             => __( 'No subscriptions found.', 'pronamic_ideal' ),
-					'not_found_in_trash'    => __( 'No subscriptions found in Trash.', 'pronamic_ideal' ),
-					'menu_name'             => __( 'Subscriptions', 'pronamic_ideal' ),
-					'filter_items_list'     => __( 'Filter subscriptions list', 'pronamic_ideal' ),
-					'items_list_navigation' => __( 'Subscriptions list navigation', 'pronamic_ideal' ),
-					'items_list'            => __( 'Subscriptions list', 'pronamic_ideal' ),
+					'name'                  => __('Subscriptions', 'pronamic_ideal'),
+					'singular_name'         => __('Subscription', 'pronamic_ideal'),
+					'add_new'               => __('Add New', 'pronamic_ideal'),
+					'add_new_item'          => __('Add New Subscription', 'pronamic_ideal'),
+					'edit_item'             => __('Edit Subscription', 'pronamic_ideal'),
+					'new_item'              => __('New Subscription', 'pronamic_ideal'),
+					'all_items'             => __('All Subscriptions', 'pronamic_ideal'),
+					'view_item'             => __('View Subscription', 'pronamic_ideal'),
+					'search_items'          => __('Search Subscriptions', 'pronamic_ideal'),
+					'not_found'             => __('No subscriptions found.', 'pronamic_ideal'),
+					'not_found_in_trash'    => __('No subscriptions found in Trash.', 'pronamic_ideal'),
+					'menu_name'             => __('Subscriptions', 'pronamic_ideal'),
+					'filter_items_list'     => __('Filter subscriptions list', 'pronamic_ideal'),
+					'items_list_navigation' => __('Subscriptions list navigation', 'pronamic_ideal'),
+					'items_list'            => __('Subscriptions list', 'pronamic_ideal'),
 				),
 				'public'             => false,
 				'publicly_queryable' => false,
@@ -86,67 +86,67 @@ 
 		 */
 		register_post_status(
 			'subscr_pending', array(
-				'label'                     => _x( 'Pending', 'Subscription status', 'pronamic_ideal' ),
+				'label'                     => _x('Pending', 'Subscription status', 'pronamic_ideal'),
 				'public'                    => false,
 				'exclude_from_search'       => false,
 				'show_in_admin_all_list'    => true,
 				'show_in_admin_status_list' => true,
-				'label_count'               => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>', 'pronamic_ideal' ),
+				'label_count'               => _n_noop('Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>', 'pronamic_ideal'),
 			)
 		);
 
 		register_post_status(
 			'subscr_cancelled', array(
-				'label'                     => _x( 'Cancelled', 'Subscription status', 'pronamic_ideal' ),
+				'label'                     => _x('Cancelled', 'Subscription status', 'pronamic_ideal'),
 				'public'                    => false,
 				'exclude_from_search'       => false,
 				'show_in_admin_all_list'    => true,
 				'show_in_admin_status_list' => true,
-				'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'pronamic_ideal' ),
+				'label_count'               => _n_noop('Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'pronamic_ideal'),
 			)
 		);
 
 		register_post_status(
 			'subscr_expired', array(
-				'label'                     => _x( 'Expired', 'Subscription status', 'pronamic_ideal' ),
+				'label'                     => _x('Expired', 'Subscription status', 'pronamic_ideal'),
 				'public'                    => false,
 				'exclude_from_search'       => false,
 				'show_in_admin_all_list'    => true,
 				'show_in_admin_status_list' => true,
-				'label_count'               => _n_noop( 'Expired <span class="count">(%s)</span>', 'Expired <span class="count">(%s)</span>', 'pronamic_ideal' ),
+				'label_count'               => _n_noop('Expired <span class="count">(%s)</span>', 'Expired <span class="count">(%s)</span>', 'pronamic_ideal'),
 			)
 		);
 
 		register_post_status(
 			'subscr_failed', array(
-				'label'                     => _x( 'Failed', 'Subscription status', 'pronamic_ideal' ),
+				'label'                     => _x('Failed', 'Subscription status', 'pronamic_ideal'),
 				'public'                    => false,
 				'exclude_from_search'       => false,
 				'show_in_admin_all_list'    => true,
 				'show_in_admin_status_list' => true,
-				'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'pronamic_ideal' ),
+				'label_count'               => _n_noop('Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'pronamic_ideal'),
 			)
 		);
 
 		register_post_status(
 			'subscr_active', array(
-				'label'                     => _x( 'Active', 'Subscription status', 'pronamic_ideal' ),
+				'label'                     => _x('Active', 'Subscription status', 'pronamic_ideal'),
 				'public'                    => false,
 				'exclude_from_search'       => false,
 				'show_in_admin_all_list'    => true,
 				'show_in_admin_status_list' => true,
-				'label_count'               => _n_noop( 'Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', 'pronamic_ideal' ),
+				'label_count'               => _n_noop('Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', 'pronamic_ideal'),
 			)
 		);
 
 		register_post_status(
 			'subscr_completed', array(
-				'label'                     => _x( 'Completed', 'Subscription status', 'pronamic_ideal' ),
+				'label'                     => _x('Completed', 'Subscription status', 'pronamic_ideal'),
 				'public'                    => false,
 				'exclude_from_search'       => false,
 				'show_in_admin_all_list'    => true,
 				'show_in_admin_status_list' => true,
-				'label_count'               => _n_noop( 'Completed <span class="count">(%s)</span>', 'Completed <span class="count">(%s)</span>', 'pronamic_ideal' ),
+				'label_count'               => _n_noop('Completed <span class="count">(%s)</span>', 'Completed <span class="count">(%s)</span>', 'pronamic_ideal'),
 			)
 		);
 	}

classes/Subscriptions/SubscriptionsModule.php

Spacing +101 added lines, -101 removed lines

@@ -44,31 +44,31 @@ 
 	 *
 	 * @param Plugin $plugin The plugin.
 	 */
-	public function __construct( Plugin $plugin ) {
+	public function __construct(Plugin $plugin) {
 		$this->plugin = $plugin;
 
 		// Actions.
-		add_action( 'wp_loaded', array( $this, 'handle_subscription' ) );
+		add_action('wp_loaded', array($this, 'handle_subscription'));
 
-		add_action( 'plugins_loaded', array( $this, 'maybe_schedule_subscription_payments' ), 5 );
+		add_action('plugins_loaded', array($this, 'maybe_schedule_subscription_payments'), 5);
 
 		// Exclude payment and subscription notes.
-		add_filter( 'comments_clauses', array( $this, 'exclude_subscription_comment_notes' ), 10, 2 );
+		add_filter('comments_clauses', array($this, 'exclude_subscription_comment_notes'), 10, 2);
 
-		add_action( 'pronamic_pay_new_payment', array( $this, 'maybe_create_subscription' ) );
+		add_action('pronamic_pay_new_payment', array($this, 'maybe_create_subscription'));
 
 		// The 'pronamic_pay_update_subscription_payments' hook adds subscription payments and sends renewal notices.
-		add_action( 'pronamic_pay_update_subscription_payments', array( $this, 'update_subscription_payments' ) );
+		add_action('pronamic_pay_update_subscription_payments', array($this, 'update_subscription_payments'));
 
 		// Listen to payment status changes so we can update related subscriptions.
-		add_action( 'pronamic_payment_status_update', array( $this, 'payment_status_update' ) );
+		add_action('pronamic_payment_status_update', array($this, 'payment_status_update'));
 
 		// WordPress CLI.
 		// @see https://github.com/woocommerce/woocommerce/blob/3.3.1/includes/class-woocommerce.php#L365-L369.
 		// @see https://github.com/woocommerce/woocommerce/blob/3.3.1/includes/class-wc-cli.php.
 		// @see https://make.wordpress.org/cli/handbook/commands-cookbook/.
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			WP_CLI::add_command( 'pay subscriptions test', array( $this, 'cli_subscriptions_test' ) );
+		if (defined('WP_CLI') && WP_CLI) {
+			WP_CLI::add_command('pay subscriptions test', array($this, 'cli_subscriptions_test'));
 		}
 	}
 
@@ -79,33 +79,33 @@ 
 	 * email notifications so users can cancel or renew their subscription.
 	 */
 	public function handle_subscription() {
-		if ( ! filter_has_var( INPUT_GET, 'subscription' ) ) {
+		if ( ! filter_has_var(INPUT_GET, 'subscription')) {
 			return;
 		}
 
-		if ( ! filter_has_var( INPUT_GET, 'action' ) ) {
+		if ( ! filter_has_var(INPUT_GET, 'action')) {
 			return;
 		}
 
-		if ( ! filter_has_var( INPUT_GET, 'key' ) ) {
+		if ( ! filter_has_var(INPUT_GET, 'key')) {
 			return;
 		}
 
-		$subscription_id = filter_input( INPUT_GET, 'subscription', FILTER_SANITIZE_STRING );
-		$subscription    = get_pronamic_subscription( $subscription_id );
+		$subscription_id = filter_input(INPUT_GET, 'subscription', FILTER_SANITIZE_STRING);
+		$subscription    = get_pronamic_subscription($subscription_id);
 
-		$action = filter_input( INPUT_GET, 'action', FILTER_SANITIZE_STRING );
+		$action = filter_input(INPUT_GET, 'action', FILTER_SANITIZE_STRING);
 
-		$key = filter_input( INPUT_GET, 'key', FILTER_SANITIZE_STRING );
+		$key = filter_input(INPUT_GET, 'key', FILTER_SANITIZE_STRING);
 
 		// Check if subscription is valid.
-		if ( ! $subscription ) {
+		if ( ! $subscription) {
 			return;
 		}
 
 		// Check if subscription key is valid.
-		if ( $key !== $subscription->get_key() ) {
-			wp_redirect( home_url() );
+		if ($key !== $subscription->get_key()) {
+			wp_redirect(home_url());
 
 			exit;
 		}
@@ -113,28 +113,28 @@ 
 		// Check if we should redirect.
 		$should_redirect = true;
 
-		switch ( $action ) {
+		switch ($action) {
 			case 'cancel':
-				if ( Statuses::CANCELLED !== $subscription->get_status() ) {
-					$subscription->update_status( Statuses::CANCELLED );
+				if (Statuses::CANCELLED !== $subscription->get_status()) {
+					$subscription->update_status(Statuses::CANCELLED);
 
-					$this->update_subscription( $subscription, $should_redirect );
+					$this->update_subscription($subscription, $should_redirect);
 				}
 
 				break;
 			case 'renew':
-				$gateway = Plugin::get_gateway( $subscription->config_id );
+				$gateway = Plugin::get_gateway($subscription->config_id);
 
-				if ( Statuses::SUCCESS !== $subscription->get_status() ) {
-					$payment = $this->start_recurring( $subscription, $gateway, true );
+				if (Statuses::SUCCESS !== $subscription->get_status()) {
+					$payment = $this->start_recurring($subscription, $gateway, true);
 
-					if ( ! $gateway->has_error() ) {
+					if ( ! $gateway->has_error()) {
 						// Redirect.
-						$gateway->redirect( $payment );
+						$gateway->redirect($payment);
 					}
 				}
 
-				wp_redirect( home_url() );
+				wp_redirect(home_url());
 
 				exit;
 		}
@@ -147,21 +147,21 @@ 
 	 * @param Gateway      $gateway      The gateway to start the recurring payment at.
 	 * @param boolean      $renewal      Flag for renewal payment.
 	 */
-	public function start_recurring( Subscription $subscription, Gateway $gateway, $renewal = false ) {
-		if ( empty( $subscription->next_payment ) ) {
+	public function start_recurring(Subscription $subscription, Gateway $gateway, $renewal = false) {
+		if (empty($subscription->next_payment)) {
 			$subscription->status = Statuses::COMPLETED;
 
-			$result = $this->plugin->subscriptions_data_store->update( $subscription );
+			$result = $this->plugin->subscriptions_data_store->update($subscription);
 
 			// @todo
 			return;
 		}
 
-		if ( ! empty( $subscription->final_payment ) && $subscription->final_payment <= $subscription->next_payment ) {
+		if ( ! empty($subscription->final_payment) && $subscription->final_payment <= $subscription->next_payment) {
 			$subscription->next_payment = null;
 			$subscription->status       = Statuses::COMPLETED;
 
-			$result = $this->plugin->subscriptions_data_store->update( $subscription );
+			$result = $this->plugin->subscriptions_data_store->update($subscription);
 
 			// @todo
 			return;
@@ -170,7 +170,7 @@ 
 		$start_date = $subscription->next_payment;
 
 		$end_date = clone $start_date;
-		$end_date->add( $subscription->get_date_interval() );
+		$end_date->add($subscription->get_date_interval());
 
 		$subscription->next_payment = $end_date;
 
@@ -202,10 +202,10 @@ 
 		$payment->recurring        = ! $renewal;
 
 		// Start payment.
-		$payment = Plugin::start_payment( $payment, $gateway );
+		$payment = Plugin::start_payment($payment, $gateway);
 
 		// Update subscription.
-		$result = $this->plugin->subscriptions_data_store->update( $subscription );
+		$result = $this->plugin->subscriptions_data_store->update($subscription);
 
 		return $payment;
 	}
@@ -216,19 +216,19 @@ 
 	 * @param Subscription $subscription The updated subscription.
 	 * @param boolean      $can_redirect Flag to redirect or not.
 	 */
-	public function update_subscription( $subscription = null, $can_redirect = true ) {
-		if ( empty( $subscription ) ) {
+	public function update_subscription($subscription = null, $can_redirect = true) {
+		if (empty($subscription)) {
 			return;
 		}
 
-		$this->plugin->subscriptions_data_store->update( $subscription );
+		$this->plugin->subscriptions_data_store->update($subscription);
 
-		if ( defined( 'DOING_CRON' ) && empty( $subscription->status ) ) {
+		if (defined('DOING_CRON') && empty($subscription->status)) {
 			$can_redirect = false;
 		}
 
-		if ( $can_redirect ) {
-			wp_redirect( home_url() );
+		if ($can_redirect) {
+			wp_redirect(home_url());
 
 			exit;
 		}
@@ -241,11 +241,11 @@ 
 	 * @param WP_Comment_Query $query   The WordPress comment query object.
 	 * @return array
 	 */
-	public function exclude_subscription_comment_notes( $clauses, $query ) {
+	public function exclude_subscription_comment_notes($clauses, $query) {
 		$type = $query->query_vars['type'];
 
 		// Ignore subscription notes comments if it's not specifically requested.
-		if ( 'subscription_note' !== $type ) {
+		if ('subscription_note' !== $type) {
 			$clauses['where'] .= " AND comment_type != 'subscription_note'";
 		}
 
@@ -256,11 +256,11 @@ 
 	 * Maybe schedule subscription payments.
 	 */
 	public function maybe_schedule_subscription_payments() {
-		if ( wp_next_scheduled( 'pronamic_pay_update_subscription_payments' ) ) {
+		if (wp_next_scheduled('pronamic_pay_update_subscription_payments')) {
 			return;
 		}
 
-		wp_schedule_event( time(), 'hourly', 'pronamic_pay_update_subscription_payments' );
+		wp_schedule_event(time(), 'hourly', 'pronamic_pay_update_subscription_payments');
 	}
 
 	/**
@@ -268,11 +268,11 @@ 
 	 *
 	 * @param Payment $payment The new payment.
 	 */
-	public function maybe_create_subscription( $payment ) {
+	public function maybe_create_subscription($payment) {
 		// Check if there is already subscription attached to the payment.
 		$subscription_id = $payment->get_subscription_id();
 
-		if ( ! empty( $subscription_id ) ) {
+		if ( ! empty($subscription_id)) {
 			// Subscription already created.
 			return;
 		}
@@ -280,7 +280,7 @@ 
 		// Check if there is a subscription object attached to the payment.
 		$subscription_data = $payment->subscription;
 
-		if ( empty( $subscription_data ) ) {
+		if (empty($subscription_data)) {
 			return;
 		}
 
@@ -289,13 +289,13 @@ 
 
 		$subscription->config_id       = $payment->config_id;
 		$subscription->user_id         = $payment->user_id;
-		$subscription->title           = sprintf( __( 'Subscription for %s', 'pronamic_ideal' ), $payment->title );
+		$subscription->title           = sprintf(__('Subscription for %s', 'pronamic_ideal'), $payment->title);
 		$subscription->frequency       = $subscription_data->get_frequency();
 		$subscription->interval        = $subscription_data->get_interval();
 		$subscription->interval_period = $subscription_data->get_interval_period();
 		$subscription->currency        = $subscription_data->get_currency();
 		$subscription->amount          = $subscription_data->get_amount();
-		$subscription->key             = uniqid( 'subscr_' );
+		$subscription->key             = uniqid('subscr_');
 		$subscription->source          = $payment->source;
 		$subscription->source_id       = $payment->source_id;
 		$subscription->description     = $payment->description;
@@ -314,20 +314,20 @@ 
 		$expiry_date = $start_date;
 
 		$next_date = clone $start_date;
-		$next_date->add( $interval );
+		$next_date->add($interval);
 
 		$notice_date = clone $next_date;
-		$notice_date->modify( '-1 week' );
+		$notice_date->modify('-1 week');
 
 		$final_date = null;
 
-		if ( $subscription_data->frequency ) {
+		if ($subscription_data->frequency) {
 			// @see https://stackoverflow.com/a/10818981/6411283
-			$period = new DatePeriod( $start_date, $interval, $subscription_data->frequency );
+			$period = new DatePeriod($start_date, $interval, $subscription_data->frequency);
 
-			$dates = iterator_to_array( $period );
+			$dates = iterator_to_array($period);
 
-			$final_date = end( $dates );
+			$final_date = end($dates);
 		}
 
 		$subscription->start_date     = $start_date;
@@ -338,16 +338,16 @@ 
 		$subscription->renewal_notice = $notice_date;
 
 		// Create.
-		$result = $this->plugin->subscriptions_data_store->create( $subscription );
+		$result = $this->plugin->subscriptions_data_store->create($subscription);
 
-		if ( $result ) {
+		if ($result) {
 			$payment->subscription_id = $subscription->get_id();
 
 			$payment->recurring_type = 'first';
 			$payment->start_date     = $start_date;
 			$payment->end_date       = $next_date;
 
-			$this->plugin->payments_data_store->update( $payment );
+			$this->plugin->payments_data_store->update($payment);
 		}
 	}
 
@@ -381,24 +381,24 @@ 
 				),
 				array(
 					'key'     => '_pronamic_subscription_next_payment',
-					'value'   => current_time( 'mysql', true ),
+					'value'   => current_time('mysql', true),
 					'compare' => '<=',
 					'type'    => 'DATETIME',
 				),
 			),
 		);
 
-		$query = new WP_Query( $args );
+		$query = new WP_Query($args);
 
-		foreach ( $query->posts as $post ) {
-			$subscription = new Subscription( $post->ID );
+		foreach ($query->posts as $post) {
+			$subscription = new Subscription($post->ID);
 
-			$gateway = Plugin::get_gateway( $subscription->config_id );
+			$gateway = Plugin::get_gateway($subscription->config_id);
 
-			$payment = $this->start_recurring( $subscription, $gateway );
+			$payment = $this->start_recurring($subscription, $gateway);
 
-			if ( $payment ) {
-				Plugin::update_payment( $payment, false );
+			if ($payment) {
+				Plugin::update_payment($payment, false);
 			}
 		}
 	}
@@ -421,36 +421,36 @@ 
 			'meta_query'  => array(
 				array(
 					'key'     => '_pronamic_subscription_renewal_notice',
-					'value'   => current_time( 'mysql', true ),
+					'value'   => current_time('mysql', true),
 					'compare' => '<=',
 					'type'    => 'DATETIME',
 				),
 			),
 		);
 
-		$query = new WP_Query( $args );
+		$query = new WP_Query($args);
 
-		foreach ( $query->posts as $post ) {
-			$subscription = new Subscription( $post->ID );
+		foreach ($query->posts as $post) {
+			$subscription = new Subscription($post->ID);
 
-			do_action( 'pronamic_subscription_renewal_notice_' . $subscription->get_source(), $subscription );
+			do_action('pronamic_subscription_renewal_notice_' . $subscription->get_source(), $subscription);
 
 			// Set next renewal date meta.
-			$next_renewal = $subscription->get_next_payment_date( 1 );
+			$next_renewal = $subscription->get_next_payment_date(1);
 
-			if ( $next_renewal ) {
-				$next_renewal->modify( '-1 week' );
+			if ($next_renewal) {
+				$next_renewal->modify('-1 week');
 
 				// If next renewal notice date is before next payment date,
 				// prevent duplicate renewal messages by setting the renewal
 				// notice date to the date of next payment.
-				if ( $next_renewal < $subscription->get_next_payment_date() ) {
+				if ($next_renewal < $subscription->get_next_payment_date()) {
 					$next_renewal = $subscription->get_next_payment_date();
 				}
 			}
 
 			// Update or delete next renewal notice date meta.
-			$subscription->set_renewal_notice_date( $next_renewal );
+			$subscription->set_renewal_notice_date($next_renewal);
 		}
 	}
 
@@ -459,61 +459,61 @@ 
 	 *
 	 * @param Payment $payment The status updated payment.
 	 */
-	public function payment_status_update( $payment ) {
+	public function payment_status_update($payment) {
 		// Check if the payment is connected to a subscription.
 		$subscription = $payment->get_subscription();
 
-		if ( empty( $subscription ) ) {
+		if (empty($subscription)) {
 			// Payment not connected to a subscription, nothing to do.
 			return;
 		}
 
-		if ( empty( $payment->start_date ) ) {
+		if (empty($payment->start_date)) {
 			return;
 		}
 
-		if ( empty( $payment->end_date ) ) {
+		if (empty($payment->end_date)) {
 			return;
 		}
 
-		if ( Statuses::CANCELLED === $subscription->get_status() ) {
+		if (Statuses::CANCELLED === $subscription->get_status()) {
 			// If subscritpion is cancelled never change the subscription status.
 			return;
 		}
 
 		// Status.
-		switch ( $payment->get_status() ) {
+		switch ($payment->get_status()) {
 			case Statuses::OPEN:
 				// @todo
 				break;
 			case Statuses::SUCCESS:
-				$subscription->set_status( Statuses::SUCCESS );
+				$subscription->set_status(Statuses::SUCCESS);
 
-				if ( $subscription->expiry_date < $payment->end_date ) {
+				if ($subscription->expiry_date < $payment->end_date) {
 					$subscription->expiry_date = $payment->end_date;
 				}
 
 				break;
 			case Statuses::FAILURE:
-				$subscription->set_status( Statuses::CANCELLED );
+				$subscription->set_status(Statuses::CANCELLED);
 
 				break;
 			case Statuses::CANCELLED:
-				$subscription->set_status( Statuses::CANCELLED );
+				$subscription->set_status(Statuses::CANCELLED);
 
 				break;
 			case Statuses::EXPIRED:
-				$subscription->set_status( Statuses::CANCELLED );
+				$subscription->set_status(Statuses::CANCELLED);
 
 				break;
 			case Statuses::COMPLETED:
-				$subscription->set_status( Statuses::COMPLETED );
+				$subscription->set_status(Statuses::COMPLETED);
 
 				break;
 		}
 
 		// Update.
-		$result = $this->plugin->subscriptions_data_store->update( $subscription );
+		$result = $this->plugin->subscriptions_data_store->update($subscription);
 	}
 
 	/**
@@ -543,22 +543,22 @@ 
 			),
 		);
 
-		$query = new WP_Query( $args );
+		$query = new WP_Query($args);
 
-		foreach ( $query->posts as $post ) {
-			WP_CLI::log( sprintf( 'Processing post `%d` - "%s"…', $post->ID, get_the_title( $post ) ) );
+		foreach ($query->posts as $post) {
+			WP_CLI::log(sprintf('Processing post `%d` - "%s"…', $post->ID, get_the_title($post)));
 
-			$subscription = new Subscription( $post->ID );
+			$subscription = new Subscription($post->ID);
 
-			$gateway = Plugin::get_gateway( $subscription->config_id );
+			$gateway = Plugin::get_gateway($subscription->config_id);
 
-			$payment = $this->start_recurring( $subscription, $gateway );
+			$payment = $this->start_recurring($subscription, $gateway);
 
-			if ( $payment ) {
-				Plugin::update_payment( $payment, false );
+			if ($payment) {
+				Plugin::update_payment($payment, false);
 			}
 		}
 
-		WP_CLI::success( 'Pronamic Pay subscriptions test.' );
+		WP_CLI::success('Pronamic Pay subscriptions test.');
 	}
 }

classes/Subscriptions/Subscription.php

Spacing +114 added lines, -114 removed lines

@@ -284,15 +284,15 @@ 
 	 *
 	 * @param int $post_id A subscription post ID or null.
 	 */
-	public function __construct( $post_id = null ) {
+	public function __construct($post_id = null) {
 		$this->id   = $post_id;
 		$this->date = new \DateTime();
 		$this->meta = array();
 
-		if ( null !== $post_id ) {
+		if (null !== $post_id) {
 			global $pronamic_ideal;
 
-			$pronamic_ideal->subscriptions_data_store->read( $this );
+			$pronamic_ideal->subscriptions_data_store->read($this);
 		}
 	}
 
@@ -310,7 +310,7 @@ 
 	 *
 	 * @param string $id The ID of this subscription.
 	 */
-	public function set_id( $id ) {
+	public function set_id($id) {
 		$this->id = $id;
 	}
 
@@ -382,7 +382,7 @@ 
 	public function get_date_interval() {
 		$interval_spec = 'P' . $this->interval . $this->interval_period;
 
-		$interval = new DateInterval( $interval_spec );
+		$interval = new DateInterval($interval_spec);
 
 		return $interval;
 	}
@@ -428,7 +428,7 @@ 
 	 *
 	 * @param string $transaction_id A transaction ID.
 	 */
-	public function set_transaction_id( $transaction_id ) {
+	public function set_transaction_id($transaction_id) {
 		$this->transaction_id = $transaction_id;
 	}
 
@@ -448,7 +448,7 @@ 
 	 * @todo  Check constant?
 	 * @param string $status A status string.
 	 */
-	public function set_status( $status ) {
+	public function set_status($status) {
 		$this->status = $status;
 	}
 
@@ -457,7 +457,7 @@ 
 	 *
 	 * @param string $name A name.
 	 */
-	public function set_consumer_name( $name ) {
+	public function set_consumer_name($name) {
 		$this->consumer_name = $name;
 	}
 
@@ -466,7 +466,7 @@ 
 	 *
 	 * @param string $iban A IBAN.
 	 */
-	public function set_consumer_iban( $iban ) {
+	public function set_consumer_iban($iban) {
 		$this->consumer_iban = $iban;
 	}
 
@@ -475,7 +475,7 @@ 
 	 *
 	 * @param string $bic A BIC.
 	 */
-	public function set_consumer_bic( $bic ) {
+	public function set_consumer_bic($bic) {
 		$this->consumer_bic = $bic;
 	}
 
@@ -484,7 +484,7 @@ 
 	 *
 	 * @param string $note A Note.
 	 */
-	public function add_note( $note ) {
+	public function add_note($note) {
 		$commentdata = array(
 			'comment_post_ID'      => $this->id,
 			'comment_author'       => 'admin',
@@ -497,7 +497,7 @@ 
 			'comment_approved'     => 1,
 		);
 
-		$comment_id = wp_insert_comment( $commentdata );
+		$comment_id = wp_insert_comment($commentdata);
 
 		return $comment_id;
 	}
@@ -508,10 +508,10 @@ 
 	 * @param string $key A meta key.
 	 * @return string
 	 */
-	public function get_meta( $key ) {
+	public function get_meta($key) {
 		$key = '_pronamic_subscription_' . $key;
 
-		return get_post_meta( $this->id, $key, true );
+		return get_post_meta($this->id, $key, true);
 	}
 
 	/**
@@ -522,18 +522,18 @@ 
 	 *
 	 * @return boolean        True on successful update, false on failure.
 	 */
-	public function set_meta( $key, $value = false ) {
+	public function set_meta($key, $value = false) {
 		$key = '_pronamic_subscription_' . $key;
 
-		if ( $value instanceof DateTime ) {
-			$value = $value->format( 'Y-m-d H:i:s' );
+		if ($value instanceof DateTime) {
+			$value = $value->format('Y-m-d H:i:s');
 		}
 
-		if ( empty( $value ) ) {
-			return delete_post_meta( $this->id, $key );
+		if (empty($value)) {
+			return delete_post_meta($this->id, $key);
 		}
 
-		return update_post_meta( $this->id, $key, $value );
+		return update_post_meta($this->id, $key, $value);
 	}
 
 	/**
@@ -546,9 +546,9 @@ 
 
 		$payment = $this->get_first_payment();
 
-		if ( $payment ) {
-			$description = apply_filters( 'pronamic_payment_source_description', $description, $payment );
-			$description = apply_filters( 'pronamic_payment_source_description_' . $this->source, $description, $payment );
+		if ($payment) {
+			$description = apply_filters('pronamic_payment_source_description', $description, $payment);
+			$description = apply_filters('pronamic_payment_source_description_' . $this->source, $description, $payment);
 		}
 
 		return $description;
@@ -564,9 +564,9 @@ 
 
 		$payment = $this->get_first_payment();
 
-		if ( $payment ) {
-			$url = apply_filters( 'pronamic_payment_source_url', $url, $payment );
-			$url = apply_filters( 'pronamic_payment_source_url_' . $this->source, $url, $payment );
+		if ($payment) {
+			$url = apply_filters('pronamic_payment_source_url', $url, $payment);
+			$url = apply_filters('pronamic_payment_source_url_' . $this->source, $url, $payment);
 		}
 
 		return $url;
@@ -612,7 +612,7 @@ 
 	 * @return array
 	 */
 	public function get_payments() {
-		return get_pronamic_payments_by_meta( '_pronamic_payment_subscription_id', $this->id );
+		return get_pronamic_payments_by_meta('_pronamic_payment_subscription_id', $this->id);
 	}
 
 	/**
@@ -623,8 +623,8 @@ 
 	public function has_valid_payment() {
 		$payments = $this->get_payments();
 
-		foreach ( $payments as $payment ) {
-			if ( Statuses::SUCCESS === $payment->get_status() ) {
+		foreach ($payments as $payment) {
+			if (Statuses::SUCCESS === $payment->get_status()) {
 				return $payment;
 			}
 		}
@@ -640,7 +640,7 @@ 
 	public function get_first_payment() {
 		$payments = $this->get_payments();
 
-		if ( count( $payments ) > 0 ) {
+		if (count($payments) > 0) {
 			return $payments[0];
 		}
 
@@ -653,8 +653,8 @@ 
 	 * @todo  Should we set meta directly?
 	 * @param string $value A date value.
 	 */
-	public function set_start_date( $value ) {
-		$this->set_meta( 'start_date', $value );
+	public function set_start_date($value) {
+		$this->set_meta('start_date', $value);
 	}
 
 	/**
@@ -664,14 +664,14 @@ 
 	 * @return \DateTimeInterface
 	 */
 	public function get_start_date() {
-		$start_date = $this->get_meta( 'start_date' );
+		$start_date = $this->get_meta('start_date');
 
-		if ( '' !== $start_date ) {
-			return new DateTime( $start_date );
+		if ('' !== $start_date) {
+			return new DateTime($start_date);
 		}
 
-		if ( Statuses::COMPLETED !== $this->get_status() ) {
-			return new DateTime( $this->post->post_date_gmt );
+		if (Statuses::COMPLETED !== $this->get_status()) {
+			return new DateTime($this->post->post_date_gmt);
 		}
 
 		return null;
@@ -683,8 +683,8 @@ 
 	 * @todo  Should we set meta directly?
 	 * @param string $value A date value.
 	 */
-	public function set_expiry_date( $value ) {
-		$this->set_meta( 'expiry_date', $value );
+	public function set_expiry_date($value) {
+		$this->set_meta('expiry_date', $value);
 	}
 
 	/**
@@ -694,16 +694,16 @@ 
 	 * @return \DateTimeInterface
 	 */
 	public function get_expiry_date() {
-		$expiry_date = $this->get_meta( 'expiry_date' );
+		$expiry_date = $this->get_meta('expiry_date');
 
-		if ( '' !== $expiry_date ) {
-			return new DateTime( $expiry_date );
+		if ('' !== $expiry_date) {
+			return new DateTime($expiry_date);
 		}
 
 		// If no meta expiry date is set, use start date + 1 interval period.
 		$start_date = $this->get_start_date();
 
-		if ( null === $start_date ) {
+		if (null === $start_date) {
 			return null;
 		}
 
@@ -711,7 +711,7 @@ 
 			sprintf(
 				'+%d %s',
 				$this->get_interval(),
-				Util::to_interval_name( $this->get_interval_period() )
+				Util::to_interval_name($this->get_interval_period())
 			)
 		);
 	}
@@ -722,8 +722,8 @@ 
 	 * @todo  Should we set meta directly?
 	 * @param string $value A date value.
 	 */
-	public function set_first_payment_date( $value ) {
-		$this->set_meta( 'first_payment', $value );
+	public function set_first_payment_date($value) {
+		$this->set_meta('first_payment', $value);
 	}
 
 	/**
@@ -733,13 +733,13 @@ 
 	 * @return \DateTimeInterface
 	 */
 	public function get_first_payment_date() {
-		$first_date = $this->get_meta( 'first_payment' );
+		$first_date = $this->get_meta('first_payment');
 
-		if ( '' !== $first_date ) {
-			return new DateTime( $first_date );
+		if ('' !== $first_date) {
+			return new DateTime($first_date);
 		}
 
-		return new DateTime( $this->post->post_date_gmt );
+		return new DateTime($this->post->post_date_gmt);
 	}
 
 	/**
@@ -748,8 +748,8 @@ 
 	 * @todo  Should we set meta directly?
 	 * @param string $value A date value.
 	 */
-	public function set_final_payment_date( $value ) {
-		$this->set_meta( 'final_payment', $value );
+	public function set_final_payment_date($value) {
+		$this->set_meta('final_payment', $value);
 	}
 
 	/**
@@ -759,19 +759,19 @@ 
 	 * @return \DateTimeInterface
 	 */
 	public function get_final_payment_date() {
-		$final = $this->get_meta( 'final_payment' );
+		$final = $this->get_meta('final_payment');
 
-		if ( '' !== $final ) {
-			return new DateTime( $final );
+		if ('' !== $final) {
+			return new DateTime($final);
 		}
 
 		// If no frequency is set, use next payment or start date.
 		$frequency = $this->get_frequency();
 
-		if ( '' === $frequency ) {
+		if ('' === $frequency) {
 			$next_date = $this->get_next_payment_date();
 
-			if ( null === $next_date ) {
+			if (null === $next_date) {
 				return $this->get_start_date();
 			}
 
@@ -784,8 +784,8 @@ 
 		return $first_date->modify(
 			sprintf(
 				'+%d %s',
-				( $frequency - 1 ) * $this->get_interval(),
-				Util::to_interval_name( $this->get_interval_period() )
+				($frequency - 1) * $this->get_interval(),
+				Util::to_interval_name($this->get_interval_period())
 			)
 		);
 	}
@@ -796,11 +796,11 @@ 
 	 * @todo  Should we set meta directly?
 	 * @param string $value A date value.
 	 */
-	public function set_next_payment_date( $value ) {
-		$this->set_meta( 'next_payment', $value );
+	public function set_next_payment_date($value) {
+		$this->set_meta('next_payment', $value);
 
-		if ( false === $value ) {
-			$this->set_renewal_notice_date( false );
+		if (false === $value) {
+			$this->set_renewal_notice_date(false);
 		}
 	}
 
@@ -811,22 +811,22 @@ 
 	 * @param  int $cycle TODO.
 	 * @return \DateTimeInterface
 	 */
-	public function get_next_payment_date( $cycle = 0 ) {
+	public function get_next_payment_date($cycle = 0) {
 		// Meta next_payment, possibly doesn't exist if last payment has been processed.
-		$next_payment = $this->get_meta( 'next_payment' );
+		$next_payment = $this->get_meta('next_payment');
 
-		if ( '' === $next_payment ) {
+		if ('' === $next_payment) {
 			return;
 		}
 
-		$next = new DateTime( $next_payment );
+		$next = new DateTime($next_payment);
 
-		if ( 0 !== $cycle ) {
+		if (0 !== $cycle) {
 			$next->modify(
 				sprintf(
 					'+%d %s',
-					( $cycle * $this->get_interval() ),
-					Util::to_interval_name( $this->get_interval_period() )
+					($cycle * $this->get_interval()),
+					Util::to_interval_name($this->get_interval_period())
 				)
 			);
 		}
@@ -840,28 +840,28 @@ 
 	 * @todo Should we handle logic like this in a private function?
 	 */
 	private function refresh_next_payment_date() {
-		if ( null !== $this->get_next_payment_date() ) {
+		if (null !== $this->get_next_payment_date()) {
 			// Only set next payment date if not set already.
 			return;
 		}
 
 		$expiry = $this->get_expiry_date();
-		$now    = new DateTime( 'now', new DateTimeZone( Plugin::TIMEZONE ) );
+		$now    = new DateTime('now', new DateTimeZone(Plugin::TIMEZONE));
 
-		if ( $expiry > $now ) {
+		if ($expiry > $now) {
 			// Expiry date is in the future, use it.
 			$next_payment = $expiry;
 		} else {
 			$next_payment = $now;
 		}
 
-		$this->set_next_payment_date( $next_payment );
+		$this->set_next_payment_date($next_payment);
 
 		// Update renewal notice date.
-		$next_renewal = new DateTime( $next_payment->format( DateTime::ISO8601 ) );
-		$next_renewal->modify( '-1 week' );
+		$next_renewal = new DateTime($next_payment->format(DateTime::ISO8601));
+		$next_renewal->modify('-1 week');
 
-		$this->set_renewal_notice_date( $next_renewal );
+		$this->set_renewal_notice_date($next_renewal);
 	}
 
 	/**
@@ -870,8 +870,8 @@ 
 	 * @todo  Should we set meta directly?
 	 * @param string $value A date value.
 	 */
-	public function set_renewal_notice_date( $value ) {
-		$this->set_meta( 'renewal_notice', $value );
+	public function set_renewal_notice_date($value) {
+		$this->set_meta('renewal_notice', $value);
 	}
 
 	/**
@@ -881,9 +881,9 @@ 
 	 * @return \DateTimeInterface
 	 */
 	public function get_renewal_notice_date() {
-		$renewal_notice = $this->get_meta( 'renewal_notice' );
+		$renewal_notice = $this->get_meta('renewal_notice');
 
-		if ( '' !== $renewal_notice ) {
+		if ('' !== $renewal_notice) {
 			return $renewal_notice;
 		}
 
@@ -897,65 +897,65 @@ 
 	 * @param string $status The new status for this subscription.
 	 * @param string $note   The note to store with this status update.
 	 */
-	public function update_status( $status, $note = null ) {
-		if ( Statuses::ACTIVE === $status ) {
+	public function update_status($status, $note = null) {
+		if (Statuses::ACTIVE === $status) {
 			$status = Statuses::SUCCESS;
 		}
 
-		$this->set_status( $status );
+		$this->set_status($status);
 
-		switch ( $status ) {
+		switch ($status) {
 			case Statuses::OPEN:
-				$meta_status = $this->get_meta( 'status' );
+				$meta_status = $this->get_meta('status');
 
-				if ( Statuses::OPEN !== $meta_status ) {
+				if (Statuses::OPEN !== $meta_status) {
 					$this->refresh_next_payment_date();
 
-					if ( ! $note ) {
-						$this->add_note( __( "Subscription status changed to 'Open'", 'pronamic_ideal' ) );
+					if ( ! $note) {
+						$this->add_note(__("Subscription status changed to 'Open'", 'pronamic_ideal'));
 					}
 				}
 
 				break;
 			case Statuses::SUCCESS:
-				$meta_status = $this->get_meta( 'status' );
+				$meta_status = $this->get_meta('status');
 
-				if ( Statuses::SUCCESS !== $meta_status ) {
+				if (Statuses::SUCCESS !== $meta_status) {
 					$this->refresh_next_payment_date();
 
-					if ( ! $note ) {
-						$this->add_note( __( "Subscription status changed to 'Active'", 'pronamic_ideal' ) );
+					if ( ! $note) {
+						$this->add_note(__("Subscription status changed to 'Active'", 'pronamic_ideal'));
 					}
 				}
 
 				break;
 			case Statuses::FAILURE:
-				if ( ! $note ) {
-					$this->add_note( __( "Subscription status changed to 'Failed'", 'pronamic_ideal' ) );
+				if ( ! $note) {
+					$this->add_note(__("Subscription status changed to 'Failed'", 'pronamic_ideal'));
 				}
 
 				break;
 			case Statuses::CANCELLED:
-				$this->set_next_payment_date( false );
+				$this->set_next_payment_date(false);
 
-				if ( ! $note ) {
-					$this->add_note( __( "Subscription status changed to 'Cancelled'", 'pronamic_ideal' ) );
+				if ( ! $note) {
+					$this->add_note(__("Subscription status changed to 'Cancelled'", 'pronamic_ideal'));
 				}
 
 				break;
 			case Statuses::COMPLETED:
-				$this->set_next_payment_date( false );
-				$this->set_start_date( false );
+				$this->set_next_payment_date(false);
+				$this->set_start_date(false);
 
-				if ( ! $note ) {
-					$this->add_note( __( "Subscription status changed to 'Completed'", 'pronamic_ideal' ) );
+				if ( ! $note) {
+					$this->add_note(__("Subscription status changed to 'Completed'", 'pronamic_ideal'));
 				}
 
 				break;
 		}
 
-		if ( $note ) {
-			$this->add_note( $note );
+		if ($note) {
+			$this->add_note($note);
 		}
 
 		// Note: make sure Plugin::update_subscription( $subscription, $can_redirect ) is called after the status has been updated!
@@ -967,31 +967,31 @@ 
 	 * @todo  Not sure how and when this function is used.
 	 * @param array $meta The meta data to update.
 	 */
-	public function update_meta( $meta ) {
-		if ( ! is_array( $meta ) || count( $meta ) === 0 ) {
+	public function update_meta($meta) {
+		if ( ! is_array($meta) || count($meta) === 0) {
 			return;
 		}
 
 		$note = sprintf(
 			'<p>%s:</p>',
-			__( 'Subscription changed', 'pronamic_ideal' )
+			__('Subscription changed', 'pronamic_ideal')
 		);
 
 		$note .= '<dl>';
 
-		foreach ( $meta as $key => $value ) {
-			$this->set_meta( $key, $value );
+		foreach ($meta as $key => $value) {
+			$this->set_meta($key, $value);
 
-			if ( $value instanceof DateTime ) {
-				$value = date_i18n( __( 'l jS \o\f F Y, h:ia', 'pronamic_ideal' ), $value->getTimestamp() );
+			if ($value instanceof DateTime) {
+				$value = date_i18n(__('l jS \o\f F Y, h:ia', 'pronamic_ideal'), $value->getTimestamp());
 			}
 
-			$note .= sprintf( '<dt>%s</dt>', esc_html( $key ) );
-			$note .= sprintf( '<dd>%s</dd>', esc_html( $value ) );
+			$note .= sprintf('<dt>%s</dt>', esc_html($key));
+			$note .= sprintf('<dd>%s</dd>', esc_html($value));
 		}
 
 		$note .= '</dl>';
 
-		$this->add_note( $note );
+		$this->add_note($note);
 	}
 }

classes/Subscriptions/SubscriptionsDataStoreCPT.php

Spacing +69 added lines, -69 removed lines

@@ -29,30 +29,30 @@ 
 	 * @see https://github.com/woocommerce/woocommerce/blob/3.2.6/includes/data-stores/abstract-wc-order-data-store-cpt.php#L47-L76
 	 * @param Subscription $subscription Create the specified subscription in this data store.
 	 */
-	public function create( $subscription ) {
+	public function create($subscription) {
 		$result = wp_insert_post(
 			array(
 				'post_type'     => 'pronamic_pay_subscr',
-				'post_date_gmt' => $subscription->date->format( 'Y-m-d H:i:s' ),
+				'post_date_gmt' => $subscription->date->format('Y-m-d H:i:s'),
 				'post_title'    => sprintf(
 					'Subscription – %s',
-					date_i18n( _x( '@todo', 'Subscription title date format parsed by `date_i18n`.', 'pronamic_ideal' ) )
+					date_i18n(_x('@todo', 'Subscription title date format parsed by `date_i18n`.', 'pronamic_ideal'))
 				),
-				'post_status'   => $this->get_post_status( $subscription ),
+				'post_status'   => $this->get_post_status($subscription),
 				'post_author'   => $subscription->user_id,
 			), true
 		);
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
 			return false;
 		}
 
-		$subscription->set_id( $result );
-		$subscription->post = get_post( $result );
+		$subscription->set_id($result);
+		$subscription->post = get_post($result);
 
-		$this->update_post_meta( $subscription );
+		$this->update_post_meta($subscription);
 
-		do_action( 'pronamic_pay_new_subscription', $subscription );
+		do_action('pronamic_pay_new_subscription', $subscription);
 
 		return true;
 	}
@@ -64,13 +64,13 @@ 
 	 * @see https://github.com/woocommerce/woocommerce/blob/3.2.6/includes/data-stores/class-wc-order-data-store-cpt.php#L81-L136
 	 * @param Subscription $subscription The subscription to read the additional data for.
 	 */
-	public function read( $subscription ) {
-		$subscription->post    = get_post( $subscription->get_id() );
-		$subscription->title   = get_the_title( $subscription->get_id() );
-		$subscription->date    = new \DateTime( get_post_field( 'post_date_gmt', $subscription->get_id(), 'raw' ) );
-		$subscription->user_id = get_post_field( 'post_author', $subscription->get_id(), 'raw' );
+	public function read($subscription) {
+		$subscription->post    = get_post($subscription->get_id());
+		$subscription->title   = get_the_title($subscription->get_id());
+		$subscription->date    = new \DateTime(get_post_field('post_date_gmt', $subscription->get_id(), 'raw'));
+		$subscription->user_id = get_post_field('post_author', $subscription->get_id(), 'raw');
 
-		$this->read_post_meta( $subscription );
+		$this->read_post_meta($subscription);
 	}
 
 	/**
@@ -80,20 +80,20 @@ 
 	 * @see https://github.com/woocommerce/woocommerce/blob/3.2.6/includes/data-stores/class-wc-order-data-store-cpt.php#L154-L257
 	 * @param Subscription $subscription The subscription to update in this data store.
 	 */
-	public function update( $subscription ) {
+	public function update($subscription) {
 		$data = array(
 			'ID' => $subscription->get_id(),
 		);
 
-		$post_status = $this->get_post_status( $subscription, null );
+		$post_status = $this->get_post_status($subscription, null);
 
-		if ( null !== $post_status ) {
+		if (null !== $post_status) {
 			$data['post_status'] = $post_status;
 		}
 
-		wp_update_post( $data );
+		wp_update_post($data);
 
-		$this->update_post_meta( $subscription );
+		$this->update_post_meta($subscription);
 	}
 
 	/**
@@ -103,8 +103,8 @@ 
 	 * @param string       $default      The deafult post status if the meta status could not be converted to a post status.
 	 * @return string
 	 */
-	private function get_post_status( $subscription, $default = 'subscr_pending' ) {
-		switch ( $subscription->status ) {
+	private function get_post_status($subscription, $default = 'subscr_pending') {
+		switch ($subscription->status) {
 			case Statuses::CANCELLED:
 				return 'subscr_cancelled';
 
@@ -134,60 +134,60 @@ 
 	 * @see https://github.com/woocommerce/woocommerce/blob/3.2.6/includes/abstracts/abstract-wc-data.php#L462-L507
 	 * @param Subscription $subscription The subscription to read the post meta for.
 	 */
-	private function read_post_meta( $subscription ) {
+	private function read_post_meta($subscription) {
 		$prefix = '_pronamic_subscription_';
 
 		$id = $subscription->get_id();
 
-		$subscription->config_id       = get_post_meta( $id, $prefix . 'config_id', true );
-		$subscription->key             = get_post_meta( $id, $prefix . 'key', true );
-		$subscription->source          = get_post_meta( $id, $prefix . 'source', true );
-		$subscription->source_id       = get_post_meta( $id, $prefix . 'source_id', true );
-		$subscription->frequency       = get_post_meta( $id, $prefix . 'frequency', true );
-		$subscription->interval        = get_post_meta( $id, $prefix . 'interval', true );
-		$subscription->interval_period = get_post_meta( $id, $prefix . 'interval_period', true );
-		$subscription->currency        = get_post_meta( $id, $prefix . 'currency', true );
-		$subscription->amount          = get_post_meta( $id, $prefix . 'amount', true );
-		$subscription->transaction_id  = get_post_meta( $id, $prefix . 'transaction_id', true );
-		$subscription->status          = get_post_meta( $id, $prefix . 'status', true );
-		$subscription->description     = get_post_meta( $id, $prefix . 'description', true );
-		$subscription->email           = get_post_meta( $id, $prefix . 'email', true );
-		$subscription->customer_name   = get_post_meta( $id, $prefix . 'customer_name', true );
-		$subscription->payment_method  = get_post_meta( $id, $prefix . 'payment_method', true );
+		$subscription->config_id       = get_post_meta($id, $prefix . 'config_id', true);
+		$subscription->key             = get_post_meta($id, $prefix . 'key', true);
+		$subscription->source          = get_post_meta($id, $prefix . 'source', true);
+		$subscription->source_id       = get_post_meta($id, $prefix . 'source_id', true);
+		$subscription->frequency       = get_post_meta($id, $prefix . 'frequency', true);
+		$subscription->interval        = get_post_meta($id, $prefix . 'interval', true);
+		$subscription->interval_period = get_post_meta($id, $prefix . 'interval_period', true);
+		$subscription->currency        = get_post_meta($id, $prefix . 'currency', true);
+		$subscription->amount          = get_post_meta($id, $prefix . 'amount', true);
+		$subscription->transaction_id  = get_post_meta($id, $prefix . 'transaction_id', true);
+		$subscription->status          = get_post_meta($id, $prefix . 'status', true);
+		$subscription->description     = get_post_meta($id, $prefix . 'description', true);
+		$subscription->email           = get_post_meta($id, $prefix . 'email', true);
+		$subscription->customer_name   = get_post_meta($id, $prefix . 'customer_name', true);
+		$subscription->payment_method  = get_post_meta($id, $prefix . 'payment_method', true);
 
 		$first_payment = $subscription->get_first_payment();
 
-		if ( is_object( $first_payment ) ) {
-			if ( empty( $subscription->config_id ) ) {
+		if (is_object($first_payment)) {
+			if (empty($subscription->config_id)) {
 				$subscription->config_id = $first_payment->config_id;
 			}
 
-			if ( empty( $subscription->user_id ) ) {
+			if (empty($subscription->user_id)) {
 				$subscription->user_id = $first_payment->user_id;
 			}
 
-			if ( empty( $subscription->payment_method ) ) {
+			if (empty($subscription->payment_method)) {
 				$subscription->payment_method = $first_payment->method;
 			}
 		}
 
-		$date_string              = get_post_meta( $id, $prefix . 'start_date', true );
-		$subscription->start_date = empty( $date_string ) ? null : new DateTime( $date_string );
+		$date_string              = get_post_meta($id, $prefix . 'start_date', true);
+		$subscription->start_date = empty($date_string) ? null : new DateTime($date_string);
 
-		$date_string               = get_post_meta( $id, $prefix . 'expiry_date', true );
-		$subscription->expiry_date = empty( $date_string ) ? null : new DateTime( $date_string );
+		$date_string               = get_post_meta($id, $prefix . 'expiry_date', true);
+		$subscription->expiry_date = empty($date_string) ? null : new DateTime($date_string);
 
-		$date_string                 = get_post_meta( $id, $prefix . 'first_payment', true );
-		$subscription->first_payment = empty( $date_string ) ? null : new DateTime( $date_string );
+		$date_string                 = get_post_meta($id, $prefix . 'first_payment', true);
+		$subscription->first_payment = empty($date_string) ? null : new DateTime($date_string);
 
-		$date_string                = get_post_meta( $id, $prefix . 'next_payment', true );
-		$subscription->next_payment = empty( $date_string ) ? null : new DateTime( $date_string );
+		$date_string                = get_post_meta($id, $prefix . 'next_payment', true);
+		$subscription->next_payment = empty($date_string) ? null : new DateTime($date_string);
 
-		$date_string                 = get_post_meta( $id, $prefix . 'final_payment', true );
-		$subscription->final_payment = empty( $date_string ) ? null : new DateTime( $date_string );
+		$date_string                 = get_post_meta($id, $prefix . 'final_payment', true);
+		$subscription->final_payment = empty($date_string) ? null : new DateTime($date_string);
 
-		$date_string                  = get_post_meta( $id, $prefix . 'renewal_notice', true );
-		$subscription->renewal_notice = empty( $date_string ) ? null : new DateTime( $date_string );
+		$date_string                  = get_post_meta($id, $prefix . 'renewal_notice', true);
+		$subscription->renewal_notice = empty($date_string) ? null : new DateTime($date_string);
 	}
 
 	/**
@@ -196,14 +196,14 @@ 
 	 * @see https://github.com/woocommerce/woocommerce/blob/3.2.6/includes/data-stores/class-wc-order-data-store-cpt.php#L154-L257
 	 * @param Subscription $subscription The subscription to update the post meta for.
 	 */
-	private function update_post_meta( $subscription ) {
+	private function update_post_meta($subscription) {
 		$prefix = '_pronamic_subscription_';
 
 		$id = $subscription->get_id();
 
-		$previous_status = get_post_meta( $id, '_pronamic_subscription_status', true );
-		$previous_status = strtolower( $previous_status );
-		$previous_status = empty( $previous_status ) ? 'unknown' : $previous_status;
+		$previous_status = get_post_meta($id, '_pronamic_subscription_status', true);
+		$previous_status = strtolower($previous_status);
+		$previous_status = empty($previous_status) ? 'unknown' : $previous_status;
 
 		$data = array(
 			'config_id'       => $subscription->config_id,
@@ -238,28 +238,28 @@ 
 			'renewal_notice',
 		);
 
-		foreach ( $date_properties as $property ) {
-			if ( property_exists( $subscription, $property ) && $subscription->$property instanceof \DateTimeInterface ) {
-				$data[ $property ] = $subscription->$property->format( 'Y-m-d H:i:s' );
+		foreach ($date_properties as $property) {
+			if (property_exists($subscription, $property) && $subscription->$property instanceof \DateTimeInterface) {
+				$data[$property] = $subscription->$property->format('Y-m-d H:i:s');
 			}
 		}
 
-		$data = array_merge( $subscription->meta, $data );
+		$data = array_merge($subscription->meta, $data);
 
-		foreach ( $data as $key => $value ) {
-			if ( ! empty( $value ) ) {
+		foreach ($data as $key => $value) {
+			if ( ! empty($value)) {
 				$meta_key = $prefix . $key;
 
-				update_post_meta( $id, $meta_key, $value );
+				update_post_meta($id, $meta_key, $value);
 			}
 		}
 
-		if ( $previous_status !== $subscription->status ) {
+		if ($previous_status !== $subscription->status) {
 			$can_redirect = false;
 
-			do_action( 'pronamic_subscription_status_update_' . $subscription->source . '_' . strtolower( $previous_status ) . '_to_' . strtolower( $subscription->status ), $subscription, $can_redirect );
-			do_action( 'pronamic_subscription_status_update_' . $subscription->source, $subscription, $can_redirect );
-			do_action( 'pronamic_subscription_status_update', $subscription, $can_redirect );
+			do_action('pronamic_subscription_status_update_' . $subscription->source . '_' . strtolower($previous_status) . '_to_' . strtolower($subscription->status), $subscription, $can_redirect);
+			do_action('pronamic_subscription_status_update_' . $subscription->source, $subscription, $can_redirect);
+			do_action('pronamic_subscription_status_update', $subscription, $can_redirect);
 		}
 	}
 }

classes/GoogleAnalyticsEcommerce.php

Spacing +35 added lines, -35 removed lines

@@ -49,7 +49,7 @@ 
 	 */
 	public function __construct() {
 		// Actions.
-		add_action( 'pronamic_payment_status_update', array( $this, 'maybe_send_transaction' ), 10, 2 );
+		add_action('pronamic_payment_status_update', array($this, 'maybe_send_transaction'), 10, 2);
 	}
 
 	/**
@@ -58,32 +58,32 @@ 
 	 * @param Payment $payment      Payment.
 	 * @param boolean $can_redirect Flag which indicates if a redirect is allowed in this function.
 	 */
-	public function maybe_send_transaction( $payment, $can_redirect ) {
+	public function maybe_send_transaction($payment, $can_redirect) {
 		// Only process successful payments.
-		if ( Statuses::SUCCESS !== $payment->get_status() ) {
+		if (Statuses::SUCCESS !== $payment->get_status()) {
 			return;
 		}
 
 		// Ignore free orders.
 		$amount = $payment->get_amount();
 
-		if ( empty( $amount ) ) {
+		if (empty($amount)) {
 			return;
 		}
 
 		// Check if Google Analytics property ID has been set.
-		$property_id = get_option( 'pronamic_pay_google_analytics_property' );
+		$property_id = get_option('pronamic_pay_google_analytics_property');
 
-		if ( empty( $property_id ) ) {
+		if (empty($property_id)) {
 			return;
 		}
 
 		// Ignore test mode payments.
-		if ( Gateway::MODE_TEST === get_post_meta( $payment->config_id, '_pronamic_gateway_mode', true ) ) {
+		if (Gateway::MODE_TEST === get_post_meta($payment->config_id, '_pronamic_gateway_mode', true)) {
 			return;
 		}
 
-		$this->send_transaction( $payment );
+		$this->send_transaction($payment);
 	}
 
 	/**
@@ -106,11 +106,11 @@ 
 	 *
 	 * @param Payment $payment Payment.
 	 */
-	private function send_transaction( $payment ) {
+	private function send_transaction($payment) {
 		$defaults = array(
 			'v'   => self::API_VERSION,
-			'tid' => get_option( 'pronamic_pay_google_analytics_property' ),
-			'cid' => $this->get_client_id( $payment ),
+			'tid' => get_option('pronamic_pay_google_analytics_property'),
+			'cid' => $this->get_client_id($payment),
 			'ti'  => $payment->get_id(),
 			'cu'  => $payment->get_currency(),
 		);
@@ -125,8 +125,8 @@ 
 
 		wp_remote_post(
 			self::API_URL, array(
-				'user-agent' => filter_input( INPUT_SERVER, 'HTTP_USER_AGENT' ),
-				'body'       => http_build_query( $transaction ),
+				'user-agent' => filter_input(INPUT_SERVER, 'HTTP_USER_AGENT'),
+				'body'       => http_build_query($transaction),
 				'blocking'   => false,
 			)
 		);
@@ -147,8 +147,8 @@ 
 
 		wp_remote_post(
 			self::API_URL, array(
-				'user-agent' => filter_input( INPUT_SERVER, 'HTTP_USER_AGENT' ),
-				'body'       => http_build_query( $item ),
+				'user-agent' => filter_input(INPUT_SERVER, 'HTTP_USER_AGENT'),
+				'body'       => http_build_query($item),
 				'blocking'   => false,
 			)
 		);
@@ -160,41 +160,41 @@ 
 	 * @param Payment $payment Payment.
 	 * @return string
 	 */
-	private function get_client_id( Payment $payment ) {
+	private function get_client_id(Payment $payment) {
 		$client_id = $payment->get_analytics_client_id();
 
-		if ( ! empty( $client_id ) ) {
+		if ( ! empty($client_id)) {
 			return $client_id;
 		}
 
-		if ( ! empty( $this->client_id ) ) {
+		if ( ! empty($this->client_id)) {
 			return $this->client_id;
 		}
 
 		// Check cookie `_ga` for Client ID.
 		$this->client_id = GoogleAnalyticsEcommerce::get_cookie_client_id();
 
-		if ( empty( $this->client_id ) ) {
+		if (empty($this->client_id)) {
 			// Generate UUID.
 			// Borrowed from https://github.com/ins0/google-measurement-php-client/blob/master/src/Racecore/GATracking/GATracking.php.
 			$this->client_id = sprintf(
 				'%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
 				// 32 bits for "time_low".
-				mt_rand( 0, 0xffff ),
-				mt_rand( 0, 0xffff ),
+				mt_rand(0, 0xffff),
+				mt_rand(0, 0xffff),
 				// 16 bits for "time_mid".
-				mt_rand( 0, 0xffff ),
+				mt_rand(0, 0xffff),
 				// 16 bits for "time_hi_and_version",.
 				// four most significant bits holds version number 4.
-				mt_rand( 0, 0x0fff ) | 0x4000,
+				mt_rand(0, 0x0fff) | 0x4000,
 				// 16 bits, 8 bits for "clk_seq_hi_res",.
 				// 8 bits for "clk_seq_low",.
 				// two most significant bits holds zero and one for variant DCE1.1.
-				mt_rand( 0, 0x3fff ) | 0x8000,
+				mt_rand(0, 0x3fff) | 0x8000,
 				// 48 bits for "node".
-				mt_rand( 0, 0xffff ),
-				mt_rand( 0, 0xffff ),
-				mt_rand( 0, 0xffff )
+				mt_rand(0, 0xffff),
+				mt_rand(0, 0xffff),
+				mt_rand(0, 0xffff)
 			);
 		}
 
@@ -207,8 +207,8 @@ 
 	 * @param string $uuid String.
 	 * @return boolean True if value is a valid UUID, false otherwise.
 	 */
-	public static function is_uuid( $uuid ) {
-		return preg_match( '#^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$#i', $uuid );
+	public static function is_uuid($uuid) {
+		return preg_match('#^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$#i', $uuid);
 	}
 
 	/**
@@ -219,21 +219,21 @@ 
 	public static function get_cookie_client_id() {
 		$client_id = null;
 
-		$ga_cookie = filter_input( INPUT_COOKIE, '_ga', FILTER_SANITIZE_STRING );
+		$ga_cookie = filter_input(INPUT_COOKIE, '_ga', FILTER_SANITIZE_STRING);
 
-		if ( empty( $ga_cookie ) ) {
+		if (empty($ga_cookie)) {
 			// No `_ga` cookie available.
 			return $client_id;
 		}
 
-		$ga = explode( '.', $ga_cookie );
+		$ga = explode('.', $ga_cookie);
 
-		if ( isset( $ga[2] ) && GoogleAnalyticsEcommerce::is_uuid( $ga[2] ) ) {
+		if (isset($ga[2]) && GoogleAnalyticsEcommerce::is_uuid($ga[2])) {
 			// Use UUID from cookie.
 			$client_id = $ga[2];
-		} elseif ( isset( $ga[2], $ga[3] ) ) {
+		} elseif (isset($ga[2], $ga[3])) {
 			// Older Google Client ID.
-			$client_id = sprintf( '%s.%s', $ga[2], $ga[3] );
+			$client_id = sprintf('%s.%s', $ga[2], $ga[3]);
 		}
 
 		return $client_id;

classes/Payments/AbstractPaymentData.php

Spacing +6 added lines, -6 removed lines

@@ -220,7 +220,7 @@ 
 	 * @return Ambigous <string, NULL>
 	 */
 	public function get_currency_numeric_code() {
-		return Currency::transform_code_to_number( $this->get_currency_alphabetic_code() );
+		return Currency::transform_code_to_number($this->get_currency_alphabetic_code());
 	}
 
 	/**
@@ -267,8 +267,8 @@ 
 	 * @param string $payment_method Payment method identifier.
 	 * @return string
 	 */
-	public function get_issuer( $payment_method = null ) {
-		if ( PaymentMethods::CREDIT_CARD === $payment_method ) {
+	public function get_issuer($payment_method = null) {
+		if (PaymentMethods::CREDIT_CARD === $payment_method) {
 			return $this->get_credit_card_issuer_id();
 		}
 
@@ -281,7 +281,7 @@ 
 	 * @return string
 	 */
 	public function get_issuer_id() {
-		return filter_input( INPUT_POST, 'pronamic_ideal_issuer_id', FILTER_SANITIZE_STRING );
+		return filter_input(INPUT_POST, 'pronamic_ideal_issuer_id', FILTER_SANITIZE_STRING);
 	}
 
 	/**
@@ -290,7 +290,7 @@ 
 	 * @return string
 	 */
 	public function get_credit_card_issuer_id() {
-		return filter_input( INPUT_POST, 'pronamic_credit_card_issuer_id', FILTER_SANITIZE_STRING );
+		return filter_input(INPUT_POST, 'pronamic_credit_card_issuer_id', FILTER_SANITIZE_STRING);
 	}
 
 	/**
@@ -332,7 +332,7 @@ 
 	 *
 	 * @param boolean $recurring Boolean flag which indicates recurring.
 	 */
-	public function set_recurring( $recurring ) {
+	public function set_recurring($recurring) {
 		$this->recurring = $recurring;
 	}
 }

classes/Payments/PaymentPostType.php

Spacing +34 added lines, -34 removed lines

@@ -33,8 +33,8 @@ 
 		 *
 		 * @see https://github.com/WordPress/WordPress/blob/4.0/wp-includes/post.php#L167
 		 */
-		add_action( 'init', array( $this, 'register_payment_post_type' ), 0 ); // Highest priority.
-		add_action( 'init', array( $this, 'register_post_status' ), 9 );
+		add_action('init', array($this, 'register_payment_post_type'), 0); // Highest priority.
+		add_action('init', array($this, 'register_post_status'), 9);
 	}
 
 	/**
@@ -45,23 +45,23 @@ 
 	public function register_payment_post_type() {
 		register_post_type(
 			'pronamic_payment', array(
-				'label'              => __( 'Payments', 'pronamic_ideal' ),
+				'label'              => __('Payments', 'pronamic_ideal'),
 				'labels'             => array(
-					'name'                  => __( 'Payments', 'pronamic_ideal' ),
-					'singular_name'         => __( 'Payment', 'pronamic_ideal' ),
-					'add_new'               => __( 'Add New', 'pronamic_ideal' ),
-					'add_new_item'          => __( 'Add New Payment', 'pronamic_ideal' ),
-					'edit_item'             => __( 'Edit Payment', 'pronamic_ideal' ),
-					'new_item'              => __( 'New Payment', 'pronamic_ideal' ),
-					'all_items'             => __( 'All Payments', 'pronamic_ideal' ),
-					'view_item'             => __( 'View Payment', 'pronamic_ideal' ),
-					'search_items'          => __( 'Search Payments', 'pronamic_ideal' ),
-					'not_found'             => __( 'No payments found.', 'pronamic_ideal' ),
-					'not_found_in_trash'    => __( 'No payments found in Trash.', 'pronamic_ideal' ),
-					'menu_name'             => __( 'Payments', 'pronamic_ideal' ),
-					'filter_items_list'     => __( 'Filter payments list', 'pronamic_ideal' ),
-					'items_list_navigation' => __( 'Payments list navigation', 'pronamic_ideal' ),
-					'items_list'            => __( 'Payments list', 'pronamic_ideal' ),
+					'name'                  => __('Payments', 'pronamic_ideal'),
+					'singular_name'         => __('Payment', 'pronamic_ideal'),
+					'add_new'               => __('Add New', 'pronamic_ideal'),
+					'add_new_item'          => __('Add New Payment', 'pronamic_ideal'),
+					'edit_item'             => __('Edit Payment', 'pronamic_ideal'),
+					'new_item'              => __('New Payment', 'pronamic_ideal'),
+					'all_items'             => __('All Payments', 'pronamic_ideal'),
+					'view_item'             => __('View Payment', 'pronamic_ideal'),
+					'search_items'          => __('Search Payments', 'pronamic_ideal'),
+					'not_found'             => __('No payments found.', 'pronamic_ideal'),
+					'not_found_in_trash'    => __('No payments found in Trash.', 'pronamic_ideal'),
+					'menu_name'             => __('Payments', 'pronamic_ideal'),
+					'filter_items_list'     => __('Filter payments list', 'pronamic_ideal'),
+					'items_list_navigation' => __('Payments list navigation', 'pronamic_ideal'),
+					'items_list'            => __('Payments list', 'pronamic_ideal'),
 				),
 				'public'             => false,
 				'publicly_queryable' => false,
@@ -87,89 +87,89 @@ 
 		 */
 		register_post_status(
 			'payment_pending', array(
-				'label'                     => _x( 'Pending', 'Payment status', 'pronamic_ideal' ),
+				'label'                     => _x('Pending', 'Payment status', 'pronamic_ideal'),
 				'public'                    => false,
 				'exclude_from_search'       => false,
 				'show_in_admin_all_list'    => true,
 				'show_in_admin_status_list' => true,
-				'label_count'               => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>', 'pronamic_ideal' ),
+				'label_count'               => _n_noop('Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>', 'pronamic_ideal'),
 			)
 		);
 
 		register_post_status(
 			'payment_processing', array(
-				'label'                     => _x( 'Processing', 'Payment status', 'pronamic_ideal' ),
+				'label'                     => _x('Processing', 'Payment status', 'pronamic_ideal'),
 				'public'                    => false,
 				'exclude_from_search'       => false,
 				'show_in_admin_all_list'    => true,
 				'show_in_admin_status_list' => true,
-				'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'pronamic_ideal' ),
+				'label_count'               => _n_noop('Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'pronamic_ideal'),
 			)
 		);
 
 		register_post_status(
 			'payment_on_hold', array(
-				'label'                     => _x( 'On Hold', 'Payment status', 'pronamic_ideal' ),
+				'label'                     => _x('On Hold', 'Payment status', 'pronamic_ideal'),
 				'public'                    => false,
 				'exclude_from_search'       => false,
 				'show_in_admin_all_list'    => true,
 				'show_in_admin_status_list' => true,
-				'label_count'               => _n_noop( 'On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'pronamic_ideal' ),
+				'label_count'               => _n_noop('On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'pronamic_ideal'),
 			)
 		);
 
 		register_post_status(
 			'payment_completed', array(
-				'label'                     => _x( 'Completed', 'Payment status', 'pronamic_ideal' ),
+				'label'                     => _x('Completed', 'Payment status', 'pronamic_ideal'),
 				'public'                    => false,
 				'exclude_from_search'       => false,
 				'show_in_admin_all_list'    => true,
 				'show_in_admin_status_list' => true,
-				'label_count'               => _n_noop( 'Completed <span class="count">(%s)</span>', 'Completed <span class="count">(%s)</span>', 'pronamic_ideal' ),
+				'label_count'               => _n_noop('Completed <span class="count">(%s)</span>', 'Completed <span class="count">(%s)</span>', 'pronamic_ideal'),
 			)
 		);
 
 		register_post_status(
 			'payment_cancelled', array(
-				'label'                     => _x( 'Cancelled', 'Payment status', 'pronamic_ideal' ),
+				'label'                     => _x('Cancelled', 'Payment status', 'pronamic_ideal'),
 				'public'                    => false,
 				'exclude_from_search'       => false,
 				'show_in_admin_all_list'    => true,
 				'show_in_admin_status_list' => true,
-				'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'pronamic_ideal' ),
+				'label_count'               => _n_noop('Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'pronamic_ideal'),
 			)
 		);
 
 		register_post_status(
 			'payment_refunded', array(
-				'label'                     => _x( 'Refunded', 'Payment status', 'pronamic_ideal' ),
+				'label'                     => _x('Refunded', 'Payment status', 'pronamic_ideal'),
 				'public'                    => false,
 				'exclude_from_search'       => false,
 				'show_in_admin_all_list'    => true,
 				'show_in_admin_status_list' => true,
-				'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'pronamic_ideal' ),
+				'label_count'               => _n_noop('Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'pronamic_ideal'),
 			)
 		);
 
 		register_post_status(
 			'payment_failed', array(
-				'label'                     => _x( 'Failed', 'Payment status', 'pronamic_ideal' ),
+				'label'                     => _x('Failed', 'Payment status', 'pronamic_ideal'),
 				'public'                    => false,
 				'exclude_from_search'       => false,
 				'show_in_admin_all_list'    => true,
 				'show_in_admin_status_list' => true,
-				'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'pronamic_ideal' ),
+				'label_count'               => _n_noop('Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'pronamic_ideal'),
 			)
 		);
 
 		register_post_status(
 			'payment_expired', array(
-				'label'                     => _x( 'Expired', 'Payment status', 'pronamic_ideal' ),
+				'label'                     => _x('Expired', 'Payment status', 'pronamic_ideal'),
 				'public'                    => false,
 				'exclude_from_search'       => false,
 				'show_in_admin_all_list'    => true,
 				'show_in_admin_status_list' => true,
-				'label_count'               => _n_noop( 'Expired <span class="count">(%s)</span>', 'Expired <span class="count">(%s)</span>', 'pronamic_ideal' ),
+				'label_count'               => _n_noop('Expired <span class="count">(%s)</span>', 'Expired <span class="count">(%s)</span>', 'pronamic_ideal'),
 			)
 		);
 	}