Skip to content

Commit

Permalink
2.12.34
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitrii-fediuk committed Oct 2, 2017
1 parent 940cb3e commit d86b569
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 19 deletions.
53 changes: 35 additions & 18 deletions Payment/Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ final function metadata() {return $this->csv();}

/**
* 2017-02-08
* @uses probablyTestableP()
* @used-by \Df\GingerPaymentsBase\Settings::api()
* @used-by \Dfe\CheckoutCom\Settings::api()
* @used-by \Dfe\Dragonpay\Signer::sign()
Expand All @@ -201,15 +202,16 @@ final function metadata() {return $this->csv();}
* @param null|string|int|S|Store $s [optional]
* @return string
*/
final function privateKey($s = null) {return $this->key('testableP', 'private', 'secret', $s);}
final function privateKey($s = null) {return $this->key('probablyTestableP', 'private', 'secret', $s);}

/**
* 2016-11-12
* @uses probablyTestable()
* @see \Dfe\Square\Settings::publicKey()
* @used-by \Dfe\IPay88\Charge::pCharge()
* @return string
*/
function publicKey() {return $this->key('testable', 'public', 'publishable');}
function publicKey() {return $this->key('probablyTestable', 'public', 'publishable');}

/**
* 2016-07-27
Expand Down Expand Up @@ -284,22 +286,6 @@ protected function prefix() {return dfc($this, function() {return
'df_payment/' . dfpm_code_short($this->_m)
;});}

/**
* 2017-04-16
* Cначала мы пробудем найти значение с приставкой test/live, а затем без приставки.
* https://english.stackexchange.com/a/200637
* @used-by merchantID()
* @param string|null $k [optional]
* @param null|string|int|S|Store $s [optional]
* @param mixed|callable $d [optional]
* @uses v()
* @return mixed
*/
final protected function probablyTestable($k = null, $s = null, $d = null) {
$k = $k ?: df_caller_f();
return $this->testableGeneric($k, 'v', $s, function() use($k) {return $this->v($k);});
}

/**
* 2017-03-27
* @override
Expand Down Expand Up @@ -439,6 +425,37 @@ private function key($method, $type, $alt, $s = null) {return
) ?: df_error("Please set your {$this->titleB()} $type key in the Magento backend.")
;}

/**
* 2017-04-16
* Cначала мы пробудем найти значение с приставкой test/live, а затем без приставки.
* https://english.stackexchange.com/a/200637
* @used-by merchantID()
* @used-by publicKey()
* @param string|null $k [optional]
* @param null|string|int|S|Store $s [optional]
* @param mixed|callable $d [optional]
* @uses v()
* @return mixed
*/
private function probablyTestable($k = null, $s = null, $d = null) {
$k = $k ?: df_caller_f();
return $this->testableGeneric($k, 'v', $s, function() use($k, $s, $d) {return $this->v($k, $s, $d);});
}

/**
* 2017-10-02
* @used-by privateKey()
* @param string|null $k [optional]
* @param null|string|int|S|Store $s [optional]
* @param mixed|callable $d [optional]
* @uses v()
* @return mixed
*/
private function probablyTestableP($k = null, $s = null, $d = null) {
$k = $k ?: df_caller_f();
return $this->testableGeneric($k, 'p', $s, function() use($k, $s, $d) {return $this->p($k, $s, $d);});
}

/**
* 2016-11-12
* @used-by probablyTestable()
Expand Down
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.12.33"
,"version": "2.12.34"
,"description": "Mage2.PRO core package."
,"type": "magento2-module"
,"homepage": "https://mage2.pro"
Expand Down

0 comments on commit d86b569

Please sign in to comment.