3.2.0: mage2pro/stripe#28

Author: dmitrii-fediuk

Config/Settings.php

@@ -178,7 +178,6 @@ final function scope($s = null) {return !is_null($s) ? $s : $this->scopeDefault(
  * @used-by \Df\Payment\ConfigProvider::configOptions()
  * @used-by \Df\Payment\Init\Action::preconfigured()
  * @used-by \Df\Payment\Method::s()
- * @used-by \Df\Payment\Settings::currency()
  * @used-by \Df\Payment\Settings::description()
  * @used-by \Df\Payment\Settings::messageFailure()
  * @used-by \Df\Payment\Settings::probablyTestable()

Core/lib/array.php

@@ -252,10 +252,12 @@ function df_filter($a, $b) {return array_filter(...(
 /**
  * 2016-10-25 Оказалось, что в ядре нет такой функции.
  * @used-by df_handle_prefix()
+ * @used-by df_sales_email_sending()
  * @used-by \Df\Framework\Plugin\View\Layout::afterIsCacheable()
  * @used-by \Df\Payment\Info\Report::addAfter()
  * @used-by \Df\Payment\Method::amountFactor()
- * @used-by \Df\Payment\this()
+ * @used-by \Df\Payment\TM::confirmed()
+ * @used-by \Dfe\Stripe\Method::cardType()
  * @param callable|array(int|string => mixed)|array[]|mixed|\Traversable $a1
  * @param callable|array(int|string => mixed)|array[]|mixed|\Traversable $a2
  * @param mixed|mixed[] $pAppend [optional]
@@ -285,10 +287,8 @@ function df_find($a1, $a2, $pAppend = [], $pPrepend = [], $keyPosition = 0) {
 default:
 $primaryArgument = [$item];
 }
-$arguments = array_merge($pPrepend, $primaryArgument, $pAppend); /** @var mixed[] $arguments */
-$partialResult = call_user_func_array($callback, $arguments); /** @var mixed $partialResult */
-if (false !== $partialResult) {
-$result = $partialResult;
+if ($r = call_user_func_array($callback, array_merge($pPrepend, $primaryArgument, $pAppend))) {
+$result = !is_bool($r) ? $r : $item;
 break;
 }
 }

Core/lib/cache.php

@@ -244,6 +244,7 @@ function dfc($o, \Closure $m, array $a = [], $unique = true, $offset = 0) {
  * The usages with 5 arguments:
  * @used-by dfak()
  * @used-by \Df\OAuth\App::state()
+ * @used-by \Df\Payment\Url::f()
  *
  * @return mixed
  */

Core/lib/caller.php

@@ -67,7 +67,6 @@ function df_caller_f($offset = 0) {
 /**
  * 2016-09-06
  * Порой бывают случаи, когда @see df_caller_f() ошибочно вызывается из @see \Closure.
- * @see \Df\Payment\Settings::currency()
  * Добавил защиту от таких случаев.
  */
 if (df_contains($result, '{closure}')) {

Core/lib/handle.php

@@ -15,9 +15,9 @@ function df_handle($name) {return in_array($name, df_handles());}
  * @param string $p
  * @return bool
  */
-function df_handle_prefix($p) {return df_find(function($handle) use($p) {return
-df_starts_with($handle, $p);
-}, df_handles());}
+function df_handle_prefix($p) {return !!df_find(function($handle) use($p) {return 
+df_starts_with($handle, $p)
+;}, df_handles());}
 
 /**
  * 2015-12-21 

Core/lib/objects.php

@@ -76,6 +76,7 @@ function df_idn($o, $allowNull = false) {return df_nat(df_id($o, $allowNull), $a
  * http://stackoverflow.com/a/25781989
  * http://php.net/manual/en/functions.arguments.php#example-145
  * @used-by \Df\API\Facade::p()
+ * @used-by \Df\Payment\Currency::f()
  * @param string $c
  * @param array ...$args
  * @return object
@@ -176,7 +177,7 @@ function dfo($object, $key, $default = null) {return
  * 2017-07-11
  * It returns a singleton of a class from the $caller module with the $owner or $suf suffix.
  * The result should be a descendant of the $owner, and should exist (it is not defaulted to $owner).
- * @used-by \Df\OAuth\App::s()
+ * @used-by df_oauth_app()
  * @used-by \Df\Zoho\App::s()
  * @used-by \Df\ZohoBI\API\Facade::s()
  * @param string|object $caller

Core/lib/reflection.php

@@ -258,7 +258,8 @@ function($c, $suf) {return
  * Отныне функция позволяет в качестве $def передавать интерфейс: @see df_class_suffix()
  *
  * @used-by \Df\API\Facade::p()
- * @used-by \Df\Sso\Button::s()
+ * @used-by \Df\Sso\Button::s() 
+ * @used-by \Df\Payment\Currency::f()
  * @param object|string $c
  * @param string $def
  * @return string|null
@@ -274,12 +275,12 @@ function df_con_heir($c, $def) {return df_ar(
  * и так до тех пор, пока не найдёт в папке предка класс с суффиксом, как у $ar.
  * 2017-02-11 Отныне функция позволяет в качестве $ar передавать интерфейс: @see df_class_suffix()
  * @used-by \Df\Config\Settings::convention()
- * @used-by \Df\Payment\Choice::factory()
+ * @used-by \Df\Payment\Choice::f()
  * @used-by \Df\Payment\Init\Action::p()
  * @used-by \Df\Payment\Method::getFormBlockType()
  * @used-by \Df\Payment\Method::getInfoBlockType()
  * @used-by \Df\Payment\Method::s()
- * @used-by \Df\Payment\Url::s()
+ * @used-by \Df\Payment\Url::f()
  * @used-by \Df\Payment\W\F::__construct()
  * @used-by \Df\Payment\W\F::s()
  * @param object|string $c

Core/lib/validation.php

@@ -52,7 +52,7 @@ function df_abstract($caller) {
 
 /**
  * 2016-11-10 
- * @used-by \Df\Payment\Choice::factory()
+ * @used-by \Df\Payment\Choice::f()
  * @param string|object $v
  * @param string|object|null $c [optional]
  * @param string|\Exception|null $m [optional]

Directory/FormElement/Currency.php

@@ -1,9 +1,9 @@
 <?php
 namespace Df\Directory\FormElement;
-use Magento\Directory\Model\Currency as CurrencyM;
 use Magento\Framework\App\ScopeInterface as S;
 use Magento\Store\Model\Store;
 // 2016-09-03
+/** @final Unable to use the PHP «final» keyword here because of the M2 code generation. */
 class Currency extends Dropdown {
 /**
  * 2016-09-04
@@ -73,26 +73,27 @@ function getValues() {return dfc($this, function() {$v = $this->dfValues(); retu
  * 2016-09-05
  * Текущая валюта может меняться динамически (в том числе посетителем магазина и сессией),
  * поэтому мы используем параметр $store, а не $scope
+ * @used-by \Df\Payment\Currency::iso3()
  * @param string $code
  * @param null|string|int|S|Store $store [optional]
- * @param CurrencyM|string|null $orderCurrency [optional]
- * @return CurrencyM
+ * @param string|null $orderCurrency [optional]
+ * @return string
  */
-static function v($code, $store = null, $orderCurrency = null) {return df_currency(dftr(
+final static function v($code, $store = null, $orderCurrency = null) {return dftr(
 $code ?: self::$ORDER, self::map($store, $orderCurrency)
-));}
+);}
 
 /**
  * 2016-09-05
  * @used-by v()
  * @param null|string|int|S|Store $store [optional]
- * @param CurrencyM|string|null $orderCurrency [optional]
- * @return array(string => CurrencyM|string|null)
+ * @param string|null $orderCurrency [optional]
+ * @return array(string => string|null)
  */
 private static function map($store = null, $orderCurrency = null) {return dfcf(
 function($store = null, $orderCurrency = null) {return [
-self::$BASE => df_currency_base($store)
-,self::$ORDER => $orderCurrency ?: df_currency_current($store)
+self::$BASE => df_currency_base_c($store)
+,self::$ORDER => $orderCurrency ?: df_currency_current_c($store)
 ];}
 , func_get_args());}
 

Directory/lib/currency.php

@@ -92,7 +92,8 @@ function df_currency($c = null) {
  * Добавил возможность передачи в качестве $scope массива из 2-х элементов: [Scope Type, Scope Code].
  * Это стало ответом на удаление из ядра класса \Magento\Framework\App\Config\ScopePool
  * в Magento CE 2.1.3: https://github.com/magento/magento2/commit/3660d012
- *
+ * @used-by \Df\Payment\Currency::rateToPayment()
+ * @used-by \Df\Payment\Currency::toBase()
  * @param null|string|int|ScopeA|Store|ConfigData|IConfigData|O|Q|array(int|string) $s [optional]
  * @return C
  */
@@ -102,6 +103,8 @@ function df_currency_base($s = null) {return df_currency(df_assert_sne(df_cfg(
 
 /**
  * 2016-09-05
+ * @used-by \Df\Directory\FormElement\Currency::map()
+ * @used-by \Df\Payment\Currency::fromBase()
  * @param null|string|int|ScopeA|Store|ConfigData|IConfigData $s [optional]
  * @return string
  */
@@ -143,6 +146,8 @@ function df_currency_code($c = null) {return df_currency($c)->getCode();}
  * @uses \Magento\Directory\Model\Currency::convert() прекрасно понимает нулевой $to:
  * https://github.com/magento/magento2/blob/2.1.1/app/code/Magento/Directory/Model/Currency.php#L216-L217
  *
+ * @used-by \Df\Payment\Currency::toBase()
+ * @used-by \Df\Payment\Currency::toOrder()
  * @param float $a
  * @param C|string|null $from [optional]
  * @param C|string|null $to [optional]
@@ -203,6 +208,7 @@ function df_currency_current($s = null) {return df_store($s)->getCurrentCurrency
  * В отличие от @see df_currency_base_с() здесь мы вынуждены использовать не $scope, а $store,
  * потому что учётную валюту можно просто считать из настроек,
  * а текущая валюта может меняться динамически (в том числе посетителем магазина и сессией).
+ * @used-by \Df\Directory\FormElement\Currency::map()
  * @param int|string|null|bool|StoreInterface $s [optional]
  * @return string
  */
@@ -221,6 +227,7 @@ function df_currency_has_rate($iso3, $s = null) {return !!dfa(df_currencies_ctn(
 /**
  * 2016-06-30
  * «How to programmatically get a currency's name by its ISO code?» https://mage2.pro/t/1833
+ * @used-by \Df\Payment\ConfigProvider::config()
  * @param string|C|string[]|C[]|null $c [optional]
  * @return string|string[]
  */