Replace "use-by-ref" by static vars when possible in closures

Author: nicolas-grekas

CurlHttpClient.php

@@ -224,9 +224,10 @@ public function request(string $method, string $url, array $options = []): Respo
             if (\is_resource($body)) {
                 $curlopts[\CURLOPT_INFILE] = $body;
             } else {
-                $eof = false;
-                $buffer = '';
-                $curlopts[\CURLOPT_READFUNCTION] = static function ($ch, $fd, $length) use ($body, &$buffer, &$eof) {
+                $curlopts[\CURLOPT_READFUNCTION] = static function ($ch, $fd, $length) use ($body) {
+                    static $eof = false;
+                    static $buffer = '';
+
                     return self::readRequestBody($length, $body, $buffer, $eof);
                 };
             }

NativeHttpClient.php

@@ -132,10 +132,8 @@ public function request(string $method, string $url, array $options = []): Respo
         ];
 
         if ($onProgress = $options['on_progress']) {
-            // Memoize the last progress to ease calling the callback periodically when no network transfer happens
-            $lastProgress = [0, 0];
             $maxDuration = 0 < $options['max_duration'] ? $options['max_duration'] : \INF;
-            $onProgress = static function (...$progress) use ($onProgress, &$lastProgress, &$info, $maxDuration) {
+            $onProgress = static function (...$progress) use ($onProgress, &$info, $maxDuration) {
                 if ($info['total_time'] >= $maxDuration) {
                     throw new TransportException(sprintf('Max duration was reached for "%s".', implode('', $info['url'])));
                 }
@@ -144,6 +142,9 @@ public function request(string $method, string $url, array $options = []): Respo
                 $progressInfo['url'] = implode('', $info['url']);
                 unset($progressInfo['size_body']);
 
+                // Memoize the last progress to ease calling the callback periodically when no network transfer happens
+                static $lastProgress = [0, 0];
+
                 if ($progress && -1 === $progress[0]) {
                     // Response completed
                     $lastProgress[0] = max($lastProgress);

NoPrivateNetworkHttpClient.php

@@ -70,9 +70,9 @@ public function request(string $method, string $url, array $options = []): Respo
         }
 
         $subnets = $this->subnets;
-        $lastPrimaryIp = '';
 
-        $options['on_progress'] = function (int $dlNow, int $dlSize, array $info) use ($onProgress, $subnets, &$lastPrimaryIp): void {
+        $options['on_progress'] = function (int $dlNow, int $dlSize, array $info) use ($onProgress, $subnets): void {
+            static $lastPrimaryIp = '';
             if ($info['primary_ip'] !== $lastPrimaryIp) {
                 if ($info['primary_ip'] && IpUtils::checkIp($info['primary_ip'], $subnets ?? self::PRIVATE_SUBNETS)) {
                     throw new TransportException(sprintf('IP "%s" is blocked for "%s".', $info['primary_ip'], $info['url']));

Response/AmpResponse.php

@@ -101,7 +101,7 @@ public function __construct(AmpClientState $multi, Request $request, array $opti
         $throttleWatcher = null;
 
         $this->id = $id = self::$nextId++;
-        Loop::defer(static function () use ($request, $multi, &$id, &$info, &$headers, $canceller, &$options, $onProgress, &$handle, $logger, &$pause) {
+        Loop::defer(static function () use ($request, $multi, $id, &$info, &$headers, $canceller, &$options, $onProgress, &$handle, $logger, &$pause) {
             return new Coroutine(self::generateResponse($request, $multi, $id, $info, $headers, $canceller, $options, $onProgress, $handle, $logger, $pause));
         });
 

RetryableHttpClient.php

@@ -53,11 +53,11 @@ public function request(string $method, string $url, array $options = []): Respo
             return new AsyncResponse($this->client, $method, $url, $options);
         }
 
-        $retryCount = 0;
-        $content = '';
-        $firstChunk = null;
+        return new AsyncResponse($this->client, $method, $url, $options, function (ChunkInterface $chunk, AsyncContext $context) use ($method, $url, $options) {
+            static $retryCount = 0;
+            static $content = '';
+            static $firstChunk;
 
-        return new AsyncResponse($this->client, $method, $url, $options, function (ChunkInterface $chunk, AsyncContext $context) use ($method, $url, $options, &$retryCount, &$content, &$firstChunk) {
             $exception = null;
             try {
                 if ($context->getInfo('canceled') || $chunk->isTimeout() || null !== $chunk->getInformationalStatus()) {

Tests/AsyncDecoratorTraitTest.php

@@ -235,8 +235,8 @@ public function testBufferPurePassthru()
 
     public function testRetryTimeout()
     {
-        $cpt = 0;
-        $client = $this->getHttpClient(__FUNCTION__, function (ChunkInterface $chunk, AsyncContext $context) use (&$cpt) {
+        $client = $this->getHttpClient(__FUNCTION__, function (ChunkInterface $chunk, AsyncContext $context) {
+            static $cpt = 0;
             try {
                 $this->assertTrue($chunk->isTimeout());
                 yield $chunk;
@@ -301,8 +301,8 @@ public function testInfoPassToDecorator()
 
     public function testMultipleYieldInInitializer()
     {
-        $first = null;
-        $client = $this->getHttpClient(__FUNCTION__, function (ChunkInterface $chunk, AsyncContext $context) use (&$first) {
+        $client = $this->getHttpClient(__FUNCTION__, function (ChunkInterface $chunk, AsyncContext $context) {
+            static $first;
             if ($chunk->isFirst()) {
                 $first = $chunk;
 
@@ -343,8 +343,8 @@ public function request(string $method, string $url, array $options = []): Respo
 
     public function testMaxDuration()
     {
-        $sawFirst = false;
-        $client = $this->getHttpClient(__FUNCTION__, function (ChunkInterface $chunk, AsyncContext $context) use (&$sawFirst) {
+        $client = $this->getHttpClient(__FUNCTION__, function (ChunkInterface $chunk, AsyncContext $context) {
+            static $sawFirst = false;
             try {
                 if (!$chunk->isFirst() || !$sawFirst) {
                     $sawFirst = $sawFirst || $chunk->isFirst();