From 82a0dd15af8ffe9cb39665e42f32931e3eac8c7f Mon Sep 17 00:00:00 2001
From: Dmitry Fedyuk <admin@dmitry-fedyuk.com>
Date: Tue, 14 Mar 2017 09:15:42 +0300
Subject: [PATCH] 1.8.0

---
 Controller/Index/Index.php                 |  2 +-
 Facade/Refund.php                          |  2 +-
 Webhook.php => W/Handler.php               | 12 ++++----
 W/Handler/Charge/Captured.php              | 34 ++++++++++++++++++++++
 {Webhook => W/Handler}/Charge/Refunded.php | 32 +++++++++++++-------
 WebhookF.php => W/Reader.php               | 16 +++++-----
 Webhook/Charge/Captured.php                | 24 ---------------
 composer.json                              |  4 +--
 8 files changed, 72 insertions(+), 54 deletions(-)
 rename Webhook.php => W/Handler.php (78%)
 create mode 100644 W/Handler/Charge/Captured.php
 rename {Webhook => W/Handler}/Charge/Refunded.php (58%)
 rename WebhookF.php => W/Reader.php (73%)
 delete mode 100644 Webhook/Charge/Captured.php

diff --git a/Controller/Index/Index.php b/Controller/Index/Index.php
index 3a40e5b..a3e6732 100644
--- a/Controller/Index/Index.php
+++ b/Controller/Index/Index.php
@@ -2,4 +2,4 @@
 namespace Dfe\Stripe\Controller\Index;
 // 2017-02-14
 /** @final Unable to use the PHP «final» keyword here because of the M2 code generation. */
-class Index extends \Df\Payment\WebhookA {}
\ No newline at end of file
+class Index extends \Df\Payment\W\Action {}
\ No newline at end of file
diff --git a/Facade/Refund.php b/Facade/Refund.php
index f568d91..5c708cd 100644
--- a/Facade/Refund.php
+++ b/Facade/Refund.php
@@ -34,7 +34,7 @@ final class Refund extends \Df\StripeClone\Facade\Refund {
 	 * $r->{'balance_transaction'}
 	 *
 	 * 2017-02-14
-	 * Этот же идентификатор должен возвращать @see \Dfe\Stripe\Webhook\Charge\Refunded::eTransId()
+	 * Этот же идентификатор должен возвращать @see \Dfe\Stripe\W\Handler\Charge\Refunded::eTransId()
 	 *
 	 * @override
 	 * @see \Df\StripeClone\Facade\Refund::transId()
diff --git a/Webhook.php b/W/Handler.php
similarity index 78%
rename from Webhook.php
rename to W/Handler.php
index 81a1735..4a2c5b2 100644
--- a/Webhook.php
+++ b/W/Handler.php
@@ -1,11 +1,11 @@
 <?php
-namespace Dfe\Stripe;
+namespace Dfe\Stripe\W;
 /**
  * 2017-01-03
- * @see \Dfe\Stripe\Webhook\Charge\Captured
- * @see \Dfe\Stripe\Webhook\Charge\Refunded
+ * @see \Dfe\Stripe\W\Handler\Charge\Captured
+ * @see \Dfe\Stripe\W\Handler\Charge\Refunded
  */
-abstract class Webhook extends \Df\StripeClone\Webhook {
+abstract class Handler extends \Df\StripeClone\W\Handler {
 	/**
 	 * 2017-01-04
 	 * 2017-01-06
@@ -22,8 +22,8 @@ abstract class Webhook extends \Df\StripeClone\Webhook {
 	 * [Stripe] An example of the «charge.captured» event (being sent to a webhook)
 	 * https://mage2.pro/t/2745
 	 * @override
-	 * @see \Df\StripeClone\Webhook::roPath()
-	 * @used-by \Df\StripeClone\Webhook::ro()
+	 * @see \Df\StripeClone\W\Handler::roPath()
+	 * @used-by \Df\StripeClone\W\Handler::ro()
 	 * @return string
 	 */
 	final protected function roPath() {return 'data/object';}
diff --git a/W/Handler/Charge/Captured.php b/W/Handler/Charge/Captured.php
new file mode 100644
index 0000000..026b315
--- /dev/null
+++ b/W/Handler/Charge/Captured.php
@@ -0,0 +1,34 @@
+<?php
+// 2017-01-04
+namespace Dfe\Stripe\W\Handler\Charge;
+use Df\StripeClone\W\Strategy\Charge\Captured as Strategy;
+use Dfe\Stripe\Method as M;
+final class Captured extends \Dfe\Stripe\W\Handler {
+	/**
+	 * 2017-01-06
+	 * @override
+	 * @see \Df\StripeClone\W\Handler::currentTransactionType()
+	 * @used-by \Df\StripeClone\W\Handler::id()
+	 * @used-by \Df\StripeClone\W\Strategy::currentTransactionType()
+	 * @return string
+	 */
+	function currentTransactionType() {return M::T_CAPTURE;}
+
+	/**
+	 * 2017-01-06
+	 * @override
+	 * @see \Df\StripeClone\W\Handler::parentTransactionType()
+	 * @used-by \Df\StripeClone\W\Handler::adaptParentId()
+	 * @return string
+	 */
+	protected function parentTransactionType() {return M::T_AUTHORIZE;}
+	
+	/**
+	 * 2017-03-13
+	 * @override
+	 * @see \Df\StripeClone\W\Handler::strategyC()
+	 * @used-by \Df\StripeClone\W\Handler::_handle()
+	 * @return string
+	 */
+	protected function strategyC() {return Strategy::class;}	
+}
\ No newline at end of file
diff --git a/Webhook/Charge/Refunded.php b/W/Handler/Charge/Refunded.php
similarity index 58%
rename from Webhook/Charge/Refunded.php
rename to W/Handler/Charge/Refunded.php
index 2985de7..cd6c9c7 100644
--- a/Webhook/Charge/Refunded.php
+++ b/W/Handler/Charge/Refunded.php
@@ -1,14 +1,15 @@
 <?php
 // 2017-01-04
-namespace Dfe\Stripe\Webhook\Charge;
+namespace Dfe\Stripe\W\Handler\Charge;
+use Df\StripeClone\W\Strategy\Charge\Refunded as Strategy;
 use Dfe\Stripe\Method as M;
-final class Refunded extends \Dfe\Stripe\Webhook implements \Df\StripeClone\Webhook\IRefund {
+final class Refunded extends \Dfe\Stripe\W\Handler implements \Df\StripeClone\W\IRefund {
 	/**
 	 * 2017-01-17
 	 * В валюте заказа (платежа), в формате платёжной системы (копейках).
 	 * @override
-	 * @see \Df\StripeClone\Webhook\IRefund::amount()
-	 * @used-by \Df\StripeClone\WebhookStrategy\Charge\Refunded::handle()
+	 * @see \Df\StripeClone\W\IRefund::amount()
+	 * @used-by \Df\StripeClone\W\Strategy\Charge\Refunded::handle()
 	 * @return int
 	 */
 	function amount() {return df_last($this->ro('refunds/data'))['amount'];}
@@ -16,9 +17,9 @@ function amount() {return df_last($this->ro('refunds/data'))['amount'];}
 	/**
 	 * 2017-01-06
 	 * @override
-	 * @see \Df\StripeClone\Webhook::currentTransactionType()
-	 * @used-by \Df\StripeClone\Webhook::id()
-	 * @used-by \Df\StripeClone\WebhookStrategy::currentTransactionType()
+	 * @see \Df\StripeClone\W\Handler::currentTransactionType()
+	 * @used-by \Df\StripeClone\W\Handler::id()
+	 * @used-by \Df\StripeClone\W\Strategy::currentTransactionType()
 	 * @return string
 	 */
 	function currentTransactionType() {return M::T_REFUND;}
@@ -32,8 +33,8 @@ function currentTransactionType() {return M::T_REFUND;}
 	 * Это должен быть тот же самый идентификатор,
 	 * который возвращает @see \Dfe\Stripe\Facade\Refund::transId()
 	 * @override
-	 * @see \Df\StripeClone\Webhook\IRefund::eTransId()
-	 * @used-by \Df\StripeClone\WebhookStrategy\Charge\Refunded::handle()
+	 * @see \Df\StripeClone\W\IRefund::eTransId()
+	 * @used-by \Df\StripeClone\W\Strategy\Charge\Refunded::handle()
 	 * @return string
 	 */
 	function eTransId() {return df_last($this->ro('refunds/data'))['balance_transaction'];}
@@ -41,9 +42,18 @@ function eTransId() {return df_last($this->ro('refunds/data'))['balance_transact
 	/**
 	 * 2016-12-16
 	 * @override
-	 * @see \Dfe\Stripe\Webhook::parentTransactionType()
-	 * @used-by \Dfe\Stripe\Webhook::adaptParentId()
+	 * @see \Dfe\Stripe\W\Handler::parentTransactionType()
+	 * @used-by \Dfe\Stripe\W\Handler::adaptParentId()
 	 * @return string
 	 */
 	protected function parentTransactionType() {return M::T_CAPTURE;}
+
+	/**
+	 * 2017-03-13
+	 * @override
+	 * @see \Df\StripeClone\W\Handler::strategyC()
+	 * @used-by \Df\StripeClone\W\Handler::_handle()
+	 * @return string
+	 */
+	protected function strategyC() {return Strategy::class;}
 }
\ No newline at end of file
diff --git a/WebhookF.php b/W/Reader.php
similarity index 73%
rename from WebhookF.php
rename to W/Reader.php
index fef1ce5..e237c36 100644
--- a/WebhookF.php
+++ b/W/Reader.php
@@ -1,7 +1,7 @@
 <?php
-// 2017-01-04
-namespace Dfe\Stripe;
-final class WebhookF extends \Df\Payment\WebhookF\Json {
+namespace Dfe\Stripe\W;
+// 2017-03-10
+final class Reader extends \Df\Payment\W\Reader\Json {
 	/**             
 	 * 2017-01-04
 	 * 2017-01-11
@@ -13,11 +13,9 @@ final class WebhookF extends \Df\Payment\WebhookF\Json {
 	 * [Stripe] An example of the «charge.captured» event (being sent to a webhook)
 	 * https://mage2.pro/t/2745
 	 * @override
-	 * @see \Df\Payment\WebhookF\Json::typeKey()
-	 * @used-by \Df\Payment\WebhookF\Json::type()
+	 * @see \Df\Payment\W\Reader::kt()
+	 * @used-by \Df\Payment\W\Reader::t()
 	 * @return string
 	 */
-	protected function typeKey() {return 'type';}
-}
-
-
+	protected function kt() {return 'type';}
+}
\ No newline at end of file
diff --git a/Webhook/Charge/Captured.php b/Webhook/Charge/Captured.php
deleted file mode 100644
index 27ef3f7..0000000
--- a/Webhook/Charge/Captured.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-// 2017-01-04
-namespace Dfe\Stripe\Webhook\Charge;
-use Dfe\Stripe\Method as M;
-final class Captured extends \Dfe\Stripe\Webhook {
-	/**
-	 * 2017-01-06
-	 * @override
-	 * @see \Df\StripeClone\Webhook::currentTransactionType()
-	 * @used-by \Df\StripeClone\Webhook::id()
-	 * @used-by \Df\StripeClone\WebhookStrategy::currentTransactionType()
-	 * @return string
-	 */
-	function currentTransactionType() {return M::T_CAPTURE;}
-
-	/**
-	 * 2017-01-06
-	 * @override
-	 * @see \Df\StripeClone\Webhook::parentTransactionType()
-	 * @used-by \Df\StripeClone\Webhook::adaptParentId()
-	 * @return string
-	 */
-	protected function parentTransactionType() {return M::T_AUTHORIZE;}
-}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 76fff8b..7a4b224 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "mage2pro/stripe"
-	,"version": "1.7.9"
+	,"version": "1.8.0"
 	,"description": "The «Stripe» payment extension for Magento 2."
 	,"type": "magento2-module"
 	,"homepage": "https://mage2.pro/c/extensions/stripe"
@@ -11,7 +11,7 @@
 		"homepage": "https://mage2.pro/users/dmitry_fedyuk",
 		"role": "Developer"
 	}]
-	,"require": {"mage2pro/core": ">=2.1.1", "stripe/stripe-php": "3.*"}
+	,"require": {"mage2pro/core": ">=2.2.0", "stripe/stripe-php": "3.*"}
 	,"autoload": {"files": ["registration.php"], "psr-4": {"Dfe\\Stripe\\": ""}}
 	,"keywords": [
 		"API"