Skip to content

Commit

Permalink
2.9.11: #17
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitrii-fediuk committed Jul 27, 2017
1 parent 427eead commit 5e93a7e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
10 changes: 7 additions & 3 deletions Payment/Operation.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
use Df\Customer\Model\Customer as DFCustomer;
use Df\Customer\Model\Gender as G;
use Df\Payment\Method as M;
use Df\Payment\Operation\Source;
// 2017-07-27
// PHP 5.6.28: «Cannot use Df\Payment\Operation\Source as Source
// because the name is already in use in Payment/Operation.php on line 6»
// https://github.com/mage2pro/core/issues/17
use Df\Payment\Operation\Source as _Source;
use Df\Payment\Operation\Source\Creditmemo as SCreditmemo;
use Df\Payment\Operation\Source\Order as SOrder;
use Df\Payment\Operation\Source\Quote as SQuote;
Expand Down Expand Up @@ -35,7 +39,7 @@ abstract class Operation implements IMA {
* @used-by \Dfe\SecurePay\Refund::p()
* @used-by \Dfe\Square\Charge::p()
* @used-by \Dfe\TwoCheckout\Charge::p()
* @param Source|SOrder|SQuote|SCreditmemo|M $src
* @param _Source|SOrder|SQuote|SCreditmemo|M $src
* 2016-09-05
* Размер транзакции в валюте платёжных транзакций,
* которая настраивается администратором опцией
Expand Down Expand Up @@ -437,7 +441,7 @@ private function customerNameA() {return dfc($this, function() {
* @used-by ii()
* @used-by s()
* @used-by store()
* @var Source|SOrder|SQuote|SCreditmemo
* @var _Source|SOrder|SQuote|SCreditmemo
*/
private $_src;
}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mage2pro/core"
,"version": "2.9.10"
,"version": "2.9.11"
,"description": "Mage2.PRO core package."
,"type": "magento2-module"
,"homepage": "https://mage2.pro"
Expand Down

0 comments on commit 5e93a7e

Please sign in to comment.