Merge branch 'release/2.0.4'

Author: rvdsteege

.scrutinizer.yml

@@ -1,5 +1,6 @@
 build:
   environment:
+    php: 7.3.0
     variables:
       WP_TESTS_DB_NAME: 'wp_phpunit_tests'
       WP_TESTS_DB_USER: 'root'

CHANGELOG.md

@@ -7,6 +7,10 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## [Unreleased][unreleased]
 -
 
+## [2.0.4] - 2019-12-22
+- Improved error handling with exceptions.
+- Updated payment status class name.
+
 ## [2.0.3] - 2019-08-26
 - Updated packages.
 
@@ -43,7 +47,8 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ### Added
 - First release.
 
-[unreleased]: https://github.com/wp-pay-extensions/wp-e-commerce/compare/2.0.3...HEAD
+[unreleased]: https://github.com/wp-pay-extensions/wp-e-commerce/compare/2.0.4...HEAD
+[2.0.4]: https://github.com/wp-pay-extensions/wp-e-commerce/compare/2.0.2...2.0.4
 [2.0.3]: https://github.com/wp-pay-extensions/wp-e-commerce/compare/2.0.2...2.0.3
 [2.0.2]: https://github.com/wp-pay-extensions/wp-e-commerce/compare/2.0.1...2.0.2
 [2.0.1]: https://github.com/wp-pay-extensions/wp-e-commerce/compare/2.0.0...2.0.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wp-e-commerce",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "WP eCommerce driver for the WordPress payment processing library.",
   "repository": {
     "type": "git",

phpcs.xml.dist

@@ -3,7 +3,7 @@
 <ruleset name="WordPress Pay WP eCommerce rules">
 	<config name="minimum_supported_wp_version" value="4.7" />
 
-	<config name="testVersion" value="5.3-" />
+	<config name="testVersion" value="5.6-" />
 
 	<file>.</file>
 

src/Extension.php

@@ -10,7 +10,7 @@
 
 namespace Pronamic\WordPress\Pay\Extensions\WPeCommerce;
 
-use Pronamic\WordPress\Pay\Core\Statuses;
+use Pronamic\WordPress\Pay\Payments\PaymentStatus;
 use Pronamic\WordPress\Pay\Extensions\WPeCommerce\Gateways\Gateway;
 use Pronamic\WordPress\Pay\Payments\Payment;
 use Pronamic\WordPress\Pay\Plugin;
@@ -22,7 +22,7 @@
  * Company: Pronamic
  *
  * @author  Remco Tolsma
- * @version 2.0.2
+ * @version 2.0.4
  * @since   1.0.0
  */
 class Extension {
@@ -187,16 +187,16 @@ public static function status_update( Payment $payment, $can_redirect = false )
 		$merchant = new Gateway( $payment->get_source_id() );
 
 		switch ( $payment->status ) {
-			case Statuses::CANCELLED:
+			case PaymentStatus::CANCELLED:
 				$merchant->set_purchase_processed_by_purchid( WPeCommerce::PURCHASE_STATUS_INCOMPLETE_SALE );
 
 				break;
 
-			case Statuses::EXPIRED:
-			case Statuses::FAILURE:
+			case PaymentStatus::EXPIRED:
+			case PaymentStatus::FAILURE:
 				break;
 
-			case Statuses::SUCCESS:
+			case PaymentStatus::SUCCESS:
 				/*
 				 * Transactions results
 				 *
@@ -210,7 +210,7 @@ public static function status_update( Payment $payment, $can_redirect = false )
 
 				break;
 
-			case Statuses::OPEN:
+			case PaymentStatus::OPEN:
 			default:
 				break;
 		}
@@ -232,7 +232,7 @@ public static function redirect_url( $url, Payment $payment ) {
 		);
 
 		switch ( $payment->status ) {
-			case Statuses::CANCELLED:
+			case PaymentStatus::CANCELLED:
 				/*
 				 * Remove 'sessionid' paramater from the transaction URL, so customers
 				 * will get a message 'Sorry your transaction was not accepted.'.
@@ -244,8 +244,8 @@ public static function redirect_url( $url, Payment $payment ) {
 				$args['return'] = 'cancel';
 
 				break;
-			case Statuses::EXPIRED:
-			case Statuses::FAILURE:
+			case PaymentStatus::EXPIRED:
+			case PaymentStatus::FAILURE:
 				/*
 				 * Remove 'sessionid' paramater from the transaction URL, so customers
 				 * will get a message 'Sorry your transaction was not accepted.'.
@@ -257,8 +257,8 @@ public static function redirect_url( $url, Payment $payment ) {
 				$args['return'] = 'error';
 
 				break;
-			case Statuses::SUCCESS:
-			case Statuses::OPEN:
+			case PaymentStatus::SUCCESS:
+			case PaymentStatus::OPEN:
 			default:
 				break;
 		}

src/Gateways/Gateway.php

@@ -26,7 +26,7 @@
  * Company: Pronamic
  *
  * @author  Remco Tolsma
- * @version 2.0.2
+ * @version 2.0.4
  * @since   1.0.0
  */
 class Gateway extends wpsc_merchant {
@@ -209,7 +209,15 @@ public function submit() {
 		);
 
 		// Start payment.
-		$payment = Plugin::start_payment( $payment );
+		$error = null;
+
+		try {
+			// @todo Build payment inside try/catch block.
+
+			$payment = Plugin::start_payment( $payment );
+		} catch ( \Exception $e ) {
+			$error = $e;
+		}
 
 		// Meta.
 		if ( isset( $this->purchase_id ) ) {
@@ -220,11 +228,8 @@ public function submit() {
 			$payment->set_meta( 'wpsc_session_id', $this->cart_data['session_id'] );
 		}
 
-		// Handle errors.
-		$error = $gateway->get_error();
-
-		if ( is_wp_error( $error ) ) {
-			Plugin::render_errors( $error );
+		if ( $error instanceof \Exception ) {
+			Plugin::render_exception( $error );
 
 			return;
 		}