10.6.3: #354

Core/lib/cache/dfc.php

@@ -30,6 +30,7 @@
  * @used-by \Df\Sso\Button::_prepareLayout()
  * ---
  * @used-by dfaoc()
+ * @see df_no_rec()
  * @see df_prop()
  * @see dfaoc()
  * @param object $o
@@ -108,6 +109,7 @@ function dfc($o, Closure $f, array $a = [], bool $unique = true, int $offset = 0
  * и поэтому Closure не уникальна.
  * 2017-08-11 The cache tags. A usage example: @see df_cache_get_simple()
  * 2017-01-02 Задавайте параметр $offset в том случае, когда dfc() вызывается опосредованно. Например, так делает @see dfac().
+ * @see df_no_rec()
  * @see dfac()
  * @used-by df_category_children_map()
  * @used-by df_currency()

Core/lib/caller/entry.php

@@ -7,6 +7,7 @@
  * @used-by df_caller_entry_m()
  * @used-by df_caller_f()
  * @used-by df_caller_m()
+ * @used-by df_caller_mf()
  * @used-by df_log_l()
  * @used-by df_sentry()
  * @used-by \Df\Framework\Log\Dispatcher::handle()

Core/lib/caller/other.php

@@ -78,6 +78,12 @@ function df_caller_m(int $o = 0):string {return df_cc_method(df_assert(df_caller
 	'df_bt_entry_is_method' /** @uses df_bt_entry_is_method() */
 )));}
 
+/**
+ * 2024-03-03
+ * @used-by df_no_rec()
+ */
+function df_caller_mf(int $o = 0):string {return df_cc_method(df_assert(df_caller_entry(++$o)));}
+
 /**
  * 2016-08-29
  * @used-by df_abstract()

Core/lib/lang/other.php

@@ -1,4 +1,5 @@
 <?php
+use Df\Core\RAM;
 /**
  * 2017-02-07
  * @used-by df_lang_zh()
@@ -17,6 +18,24 @@
  */
 function df_b(array $args, bool $r) {return !$args ? $r : $args[intval(!$r)];}
 
+/**
+ * 2024-03-03 "Refactor `static $inProcess` to a function": https://github.com/mage2pro/core/issues/354
+ * @see df_prop()
+ * @see dfc()
+ * @see dfcf()
+ * @used-by df_sprintf_strict()
+ * @used-by \Df\Qa\Failure\Error::log()
+ */
+function df_no_rec(Closure $f):void {
+	static $inProcess = []; /** @var bool[] $inProcess */
+	$k = df_caller_mf(); /** @var string $k */
+	if (!isset($inProcess[$k])) {
+		$inProcess[$k] = true;
+		try {$f();}
+		finally {unset($inProcess[$k]);}
+	}
+}
+
 /**
  * @used-by \Df\Core\Html\Tag::openTagWithAttributesAsText()
  * @param mixed $v

Core/lib/lang/prop.php

@@ -83,6 +83,7 @@ function df_n_set($v) {return is_null($v) ? DF_N : $v;}
  * @used-by \Inkifi\Pwinty\API\Entity\Order::magentoOrder()
  * @used-by \Wolf\Filter\Customer::categoryPath()
  * @used-by \Wolf\Filter\Customer::garage()
+ * @see df_no_rec()
  * @see dfc()
  * @param object|null|ArrayAccess $o
  * @param mixed|string $v [optional]

Core/lib/reflection/text/cc.php

@@ -32,6 +32,7 @@ function df_cc_class_uc(...$a):string {return df_cc_class(df_ucfirst(dfa_flatten
 /**
  * 2016-08-10 Если класс не указан, то вернёт название функции. Поэтому в качестве $a1 можно передавать `null`.
  * @used-by df_caller_m()
+ * @used-by df_caller_mf()
  * @used-by df_rest_action()
  * @used-by \Df\Qa\Trace\Frame::method()
  * @param string|object|null|array(object|string)|array(string = string) $a1

Core/lib/text/format.php

@@ -117,26 +117,20 @@ function df_sprintf_strict($s):string {/** @var string $r */ /** @var mixed[] $a
 		catch (Th $th) {
 			/**
 			 * 2024-03-03
-			 * 1) A similar code: @see \Df\Qa\Failure\Error::log()
-			 * 2) The previous (wrong) code:
+			 * The previous (wrong) code:
 			 * 		static $inProcess = false;
 			 * 		if (!$inProcess) {
 			 * https://github.com/mage2pro/core/blob/10.6.0/Core/lib/text/format.php#L118-L119
 			 * https://3v4l.org/a6oIr
 			 */
-			static $inProcess; /** @var bool $inProcess */
-			if (!$inProcess) {
-				$inProcess = true;
-				try {
-					df_error(
-						'df_sprintf_strict failed: «{message}».'
-						. "\nPattern: {$s}."
-						. "\nParameters:\n{params}."
-						,['{message}' => df_xts($th), '{params}' => print_r(df_tail($args), true)]
-					);
-				}
-				finally {$inProcess = false;}
-			}
+			df_no_rec(function() use($s, $th, $args):void {
+				df_error(
+					'df_sprintf_strict failed: «{message}».'
+					. "\nPattern: {$s}."
+					. "\nParameters:\n{params}."
+					,['{message}' => df_xts($th), '{params}' => print_r(df_tail($args), true)]
+				);
+			});
 		}
 	}
 	return $r;

Qa/Failure/Error.php

@@ -55,19 +55,14 @@ private function log():void {
 		# поэтому try... catch с целью записи отчёта крайне важно:
 		# без этого при сбое асинхроноого запроса диагностичекское сообщение о сбое окажется утраченным.
 		/** 2024-03-03 A similar code: @see df_sprintf_strict() */
-		static $inProcess;
-		if (!$inProcess) {
-			$inProcess = true;
-			try {
-				df_report('mage2.pro/{date}--{time}.log', $this->report());
-			}
+		df_no_rec(function():void {
+			try {df_report('mage2.pro/{date}--{time}.log', $this->report());}
 			# 2023-08-03 "Treat `\Throwable` similar to `\Exception`": https://github.com/mage2pro/core/issues/311
 			catch (Th $th) {
 				df_log($th);
 				throw $th;
 			}
-			finally {$inProcess = false;}
-		}
+		});
 	}
 
 	/**

Qa/lib/validation/assert.php

@@ -53,6 +53,8 @@ function df_ar($v, $c = null, $m = null) {return dfcf(function($v, $c = null, $m
  * https://github.com/mage2pro/core/blob/5.5.7/Core/Exception.php#L61-L67
  * @used-by df_assert_qty_supported()
  * @used-by df_call_parent()
+ * @used-by df_caller_m()
+ * @used-by df_caller_mf()
  * @used-by df_catalog_locator()
  * @used-by df_config_field()
  * @used-by df_configurable_children()

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "mage2pro/core"
-	,"version": "10.6.2"
+	,"version": "10.6.3"
 	,"description": "Mage2.PRO core package."
 	,"type": "magento2-module"
 	,"homepage": "https://mage2.pro"