minor #46004 [Cache] make LockRegistry use static properties instead of static variables (mrsuh)

nicolas-grekas · nicolas-grekas · commit 6d0d2f56b89a · 2022-04-12T09:07:01.000+02:00
This PR was submitted for the 5.4 branch but it was merged into the 4.4 branch instead. Discussion ---------- [Cache] make LockRegistry use static properties instead of static variables | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #44954 | License | MIT Commits ------- 3b6a56d [Cache] make LockRegistry use static properties instead of static variables
diff --git a/src/Symfony/Component/Cache/LockRegistry.php b/src/Symfony/Component/Cache/LockRegistry.php
@@ -28,6 +28,8 @@ final class LockRegistry
 {
     private static $openedFiles = [];
     private static $lockedFiles;
+    private static $signalingException;
+    private static $signalingCallback;
 
     /**
      * The number of items in this list controls the max number of concurrent processes.
@@ -92,6 +94,9 @@ public static function compute(callable $callback, ItemInterface $item, bool &$s
             return $callback($item, $save);
         }
 
+        self::$signalingException ?? self::$signalingException = unserialize("O:9:\"Exception\":1:{s:16:\"\0Exception\0trace\";a:0:{}}");
+        self::$signalingCallback ?? self::$signalingCallback = function () { throw self::$signalingException; };
+
         while (true) {
             try {
                 // race to get the lock in non-blocking mode
@@ -121,18 +126,15 @@ public static function compute(callable $callback, ItemInterface $item, bool &$s
                 flock($lock, \LOCK_UN);
                 unset(self::$lockedFiles[$key]);
             }
-            static $signalingException, $signalingCallback;
-            $signalingException = $signalingException ?? unserialize("O:9:\"Exception\":1:{s:16:\"\0Exception\0trace\";a:0:{}}");
-            $signalingCallback = $signalingCallback ?? function () use ($signalingException) { throw $signalingException; };
 
             try {
-                $value = $pool->get($item->getKey(), $signalingCallback, 0);
+                $value = $pool->get($item->getKey(), self::$signalingCallback, 0);
                 $logger && $logger->info('Item "{key}" retrieved after lock was released', ['key' => $item->getKey()]);
                 $save = false;
 
                 return $value;
             } catch (\Exception $e) {
-                if ($signalingException !== $e) {
+                if (self::$signalingException !== $e) {
                     throw $e;
                 }
                 $logger && $logger->info('Item "{key}" not found while lock was released, now retrying', ['key' => $item->getKey()]);
diff --git a/src/Symfony/Component/Cache/Traits/ContractsTrait.php b/src/Symfony/Component/Cache/Traits/ContractsTrait.php
@@ -42,7 +42,7 @@ trait ContractsTrait
     public function setCallbackWrapper(?callable $callbackWrapper): callable
     {
         if (!isset($this->callbackWrapper)) {
-            $this->callbackWrapper = [LockRegistry::class, 'compute'];
+            $this->callbackWrapper = \Closure::fromCallable([LockRegistry::class, 'compute']);;
 
             if (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
                 $this->setCallbackWrapper(null);

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ trait ContractsTrait`
`42`	`42`	`public function setCallbackWrapper(?callable $callbackWrapper): callable`
`43`	`43`	`{`
`44`	`44`	`if (!isset($this->callbackWrapper)) {`
`45`		`- $this->callbackWrapper = [LockRegistry::class, 'compute'];`
	`45`	`+ $this->callbackWrapper = \Closure::fromCallable([LockRegistry::class, 'compute']);;`
`46`	`46`
`47`	`47`	`if (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {`
`48`	`48`	`$this->setCallbackWrapper(null);`