Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitrii-fediuk committed Jan 2, 2024
1 parent 3886ded commit f5546cb
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 6 deletions.
1 change: 1 addition & 0 deletions Core/lib/array/main.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ function df_array($v):array {return is_array($v) ? $v : [$v];}

/**
* 2015-12-30 Преобразует коллекцию или массив в карту.
* @used-by df_mvars()
* @used-by \Df\Config\A::get()
* @param string|Closure $k
* @param Traversable|array(int|string => _DO) $a
Expand Down
2 changes: 2 additions & 0 deletions Core/lib/array/map.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,10 @@ function df_each($c, $f, ...$p):array {return df_map(function($v) use($f, $p) {r
* @used-by df_clean_r()
* @used-by df_db_credentials()
* @used-by df_mail()
* @used-by df_mvar_n()
* @used-by df_prices()
* @used-by df_qty()
* @used-by df_trim_text_left()
* @used-by ikf_api_oi()
* @used-by \CanadaSatellite\Core\Plugin\Magento\Catalog\Model\Product::afterGetPreconfiguredValues() (canadasatellite.ca, https://github.com/canadasatellite-ca/site/issues/83)
* @used-by \CanadaSatellite\Core\Plugin\Magento\Sales\Model\Order::afterCanInvoice() (canadasatellite.ca, https://github.com/canadasatellite-ca/site/issues/256)
Expand Down
1 change: 1 addition & 0 deletions Core/lib/array/select.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ function df_column($c, $fv, $fk = null):array {return df_map_kr($c, function($k,
* @used-by df_github_request()
* @used-by df_log_l()
* @used-by df_magento_version()
* @used-by df_mvar()
* @used-by df_oi_get()
* @used-by df_package()
* @used-by df_prop()
Expand Down
1 change: 1 addition & 0 deletions Core/lib/cache/dfc.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ function dfc($o, Closure $f, array $a = [], bool $unique = true, int $offset = 0
* @used-by df_google_init_service_account()
* @used-by df_module_file_read()
* @used-by df_modules_my()
* @used-by df_mvars()
* @used-by df_product_images_path_rel()
* @used-by dfac()
* @used-by \Df\Core\Session::s()
Expand Down
1 change: 1 addition & 0 deletions Core/lib/object/objects.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ function df_newa(string $c, string $expected = '', ...$a) {return df_ar(df_new($
* @used-by df_load()
* @used-by df_mail()
* @used-by df_mail_shipment()
* @used-by df_mvars()
* @used-by df_oi_load()
* @used-by df_order_c()
* @used-by df_package_new()
Expand Down
21 changes: 16 additions & 5 deletions Core/lib/text/trim.php
Original file line number Diff line number Diff line change
Expand Up @@ -145,20 +145,26 @@ function df_trim_text_a(string $s, array $trimA, callable $f):string {
* @used-by df_path_relative()
* @used-by df_product_image_path2rel()
* @used-by df_replace_store_code_in_url()
* @used-by df_trim_text_left()
* @used-by df_trim_text_left_right()
* @used-by dfpm_code_short()
* @used-by dfsm_code_short()
* @used-by \Df\Framework\Request::extra()
* @used-by \Df\PaypalClone\Signer::_sign()
* @used-by \Df\Qa\Trace\Frame::__toString()
* @used-by \Dfe\Zoho\App::title()
* @used-by \Dfe\Qiwi\W\Event::pid()
* @used-by \Dfe\Stripe\Facade\Token::trimmed()
* @used-by \Dfe\TwitterTimeline\Block::_toHtml()
* @used-by \Dfe\Zoho\App::title()
* @used-by \Sharapov\Cabinetsbay\Block\Category\View::images() (https://github.com/cabinetsbay/site/issues/97)
* @param string|string[] $s
* @param string|string[] $trim
* @return string|string[]
*/
function df_trim_text_left(string $s, $trim):string {return is_array($trim) ? df_trim_text_a($s, $trim, __FUNCTION__) : (
$trim === mb_substr($s, 0, $l = mb_strlen($trim)) ? mb_substr($s, $l) : $s
function df_trim_text_left($s, $trim) {return is_array($s) ? df_map(__FUNCTION__, $s, [$trim]) : (
is_array($trim) ? df_trim_text_a($s, $trim, __FUNCTION__) : (
$trim === mb_substr($s, 0, $l = mb_strlen($trim)) ? mb_substr($s, $l) : $s
)
);}

/**
Expand All @@ -179,12 +185,17 @@ function df_trim_text_left_right(string $s, string $left, string $right):string
* @used-by df_oqi_amount()
* @used-by df_trim_interceptor()
* @used-by df_trim_text_left_right()
* @used-by df_trim_text_right()
* @used-by dfe_portal_stripe_customers()
* @used-by \Df\Framework\Form\Element\Fieldset::nameFull()
* @used-by \Dfe\Oro\Test\Basic::t02_orders_stripe()
* @used-by \Dfe\TwitterTimeline\Block::_toHtml()
* @param string|string[] $s
* @param string|string[] $trim
* @return string|string[]
*/
function df_trim_text_right(string $s, $trim):string {return is_array($trim) ? df_trim_text_a($s, $trim, __FUNCTION__) : (
0 !== ($l = mb_strlen($trim)) && $trim === mb_substr($s, -$l) ? mb_substr($s, 0, -$l) : $s
function df_trim_text_right($s, $trim) {return is_array($s) ? df_map(__FUNCTION__, $s, [$trim]) :(
is_array($trim) ? df_trim_text_a($s, $trim, __FUNCTION__) : (
0 !== ($l = mb_strlen($trim)) && $trim === mb_substr($s, -$l) ? mb_substr($s, 0, -$l) : $s
)
);}
26 changes: 26 additions & 0 deletions Variable/lib/main.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php
use Magento\Variable\Model\Variable as V;
use Magento\Variable\Model\ResourceModel\Variable\Collection as VC;

/**
* 2024-01-02
* @used-by df_mvar_n()
* @return V|null
*/
function df_mvar(string $c) {return dfa(df_mvars(), $c);}

/**
* 2024-01-02
* @used-by df_mvar_n()
* @used-by \Sharapov\Cabinetsbay\Block\Category\View::images() (https://github.com/cabinetsbay/site/issues/97)
* @param string|string[] $c
* @return string|string[]
*/
function df_mvar_n($c) {return is_array($c) ? df_map(__FUNCTION__, $c) : (!($v = df_mvar($c)) ? '' : $v->getName());}

/**
* 2024-01-02
* @used-by df_mvar()
* @return array(string => V)
*/
function df_mvars():array {return dfcf(function():array {return df_index('code', df_new_om(VC::class));});}
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": "10.5.2"
,"version": "10.5.3"
,"description": "Mage2.PRO core package."
,"type": "magento2-module"
,"homepage": "https://mage2.pro"
Expand Down

0 comments on commit f5546cb

Please sign in to comment.