Leverage arrow function syntax for closure

tigitz · nicolas-grekas · commit cfe92c3dac08 · 2023-01-13T10:22:59.000+01:00
diff --git a/AcceptHeader.php b/AcceptHeader.php
@@ -115,9 +115,7 @@ public function all(): array
      */
     public function filter(string $pattern): self
     {
-        return new self(array_filter($this->items, function (AcceptHeaderItem $item) use ($pattern) {
-            return preg_match($pattern, $item->getValue());
-        }));
+        return new self(array_filter($this->items, fn (AcceptHeaderItem $item) => preg_match($pattern, $item->getValue())));
     }
 
     /**
diff --git a/FileBag.php b/FileBag.php
@@ -75,7 +75,7 @@ protected function convertFileInformation(array|UploadedFile $file): array|Uploa
                 $file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['error'], false);
             }
         } else {
-            $file = array_map(function ($v) { return $v instanceof UploadedFile || \is_array($v) ? $this->convertFileInformation($v) : $v; }, $file);
+            $file = array_map(fn ($v) => $v instanceof UploadedFile || \is_array($v) ? $this->convertFileInformation($v) : $v, $file);
             if (array_keys($keys) === $keys) {
                 $file = array_filter($file);
             }
diff --git a/Request.php b/Request.php
@@ -605,9 +605,7 @@ public static function getTrustedHeaderSet(): int
      */
     public static function setTrustedHosts(array $hostPatterns)
     {
-        self::$trustedHostPatterns = array_map(function ($hostPattern) {
-            return sprintf('{%s}i', $hostPattern);
-        }, $hostPatterns);
+        self::$trustedHostPatterns = array_map(fn ($hostPattern) => sprintf('{%s}i', $hostPattern), $hostPatterns);
         // we need to reset trusted hosts on trusted host patterns change
         self::$trustedHosts = [];
     }
diff --git a/RequestMatcher.php b/RequestMatcher.php
@@ -120,9 +120,7 @@ public function matchIps(string|array|null $ips)
     {
         $ips = null !== $ips ? (array) $ips : [];
 
-        $this->ips = array_reduce($ips, static function (array $ips, string $ip) {
-            return array_merge($ips, preg_split('/\s*,\s*/', $ip));
-        }, []);
+        $this->ips = array_reduce($ips, static fn (array $ips, string $ip) => array_merge($ips, preg_split('/\s*,\s*/', $ip)), []);
     }
 
     /**
diff --git a/RequestMatcher/IpsRequestMatcher.php b/RequestMatcher/IpsRequestMatcher.php
@@ -30,9 +30,7 @@ class IpsRequestMatcher implements RequestMatcherInterface
      */
     public function __construct(array|string $ips)
     {
-        $this->ips = array_reduce((array) $ips, static function (array $ips, string $ip) {
-            return array_merge($ips, preg_split('/\s*,\s*/', $ip));
-        }, []);
+        $this->ips = array_reduce((array) $ips, static fn (array $ips, string $ip) => array_merge($ips, preg_split('/\s*,\s*/', $ip)), []);
     }
 
     public function matches(Request $request): bool
diff --git a/RequestMatcher/MethodRequestMatcher.php b/RequestMatcher/MethodRequestMatcher.php
@@ -32,9 +32,7 @@ class MethodRequestMatcher implements RequestMatcherInterface
      */
     public function __construct(array|string $methods)
     {
-        $this->methods = array_reduce(array_map('strtoupper', (array) $methods), static function (array $methods, string $method) {
-            return array_merge($methods, preg_split('/\s*,\s*/', $method));
-        }, []);
+        $this->methods = array_reduce(array_map('strtoupper', (array) $methods), static fn (array $methods, string $method) => array_merge($methods, preg_split('/\s*,\s*/', $method)), []);
     }
 
     public function matches(Request $request): bool
diff --git a/RequestMatcher/SchemeRequestMatcher.php b/RequestMatcher/SchemeRequestMatcher.php
@@ -32,9 +32,7 @@ class SchemeRequestMatcher implements RequestMatcherInterface
      */
     public function __construct(array|string $schemes)
     {
-        $this->schemes = array_reduce(array_map('strtolower', (array) $schemes), static function (array $schemes, string $scheme) {
-            return array_merge($schemes, preg_split('/\s*,\s*/', $scheme));
-        }, []);
+        $this->schemes = array_reduce(array_map('strtolower', (array) $schemes), static fn (array $schemes, string $scheme) => array_merge($schemes, preg_split('/\s*,\s*/', $scheme)), []);
     }
 
     public function matches(Request $request): bool
diff --git a/Test/Constraint/ResponseCookieValueSame.php b/Test/Constraint/ResponseCookieValueSame.php
@@ -69,9 +69,7 @@ protected function getCookie(Response $response): ?Cookie
     {
         $cookies = $response->headers->getCookies();
 
-        $filteredCookies = array_filter($cookies, function (Cookie $cookie) {
-            return $cookie->getName() === $this->name && $cookie->getPath() === $this->path && $cookie->getDomain() === $this->domain;
-        });
+        $filteredCookies = array_filter($cookies, fn (Cookie $cookie) => $cookie->getName() === $this->name && $cookie->getPath() === $this->path && $cookie->getDomain() === $this->domain);
 
         return reset($filteredCookies) ?: null;
     }
diff --git a/Test/Constraint/ResponseHasCookie.php b/Test/Constraint/ResponseHasCookie.php
@@ -61,9 +61,7 @@ private function getCookie(Response $response): ?Cookie
     {
         $cookies = $response->headers->getCookies();
 
-        $filteredCookies = array_filter($cookies, function (Cookie $cookie) {
-            return $cookie->getName() === $this->name && $cookie->getPath() === $this->path && $cookie->getDomain() === $this->domain;
-        });
+        $filteredCookies = array_filter($cookies, fn (Cookie $cookie) => $cookie->getName() === $this->name && $cookie->getPath() === $this->path && $cookie->getDomain() === $this->domain);
 
         return reset($filteredCookies) ?: null;
     }
diff --git a/Tests/InputBagTest.php b/Tests/InputBagTest.php
@@ -64,9 +64,7 @@ public function testFilterCallback()
     public function testFilterClosure()
     {
         $bag = new InputBag(['foo' => 'bar']);
-        $result = $bag->filter('foo', null, \FILTER_CALLBACK, ['options' => function ($value) {
-            return strtoupper($value);
-        }]);
+        $result = $bag->filter('foo', null, \FILTER_CALLBACK, ['options' => strtoupper(...)]);
 
         $this->assertSame('BAR', $result);
     }
diff --git a/Tests/ParameterBagTest.php b/Tests/ParameterBagTest.php
@@ -188,9 +188,7 @@ public function testFilterCallback()
     public function testFilterClosure()
     {
         $bag = new ParameterBag(['foo' => 'bar']);
-        $result = $bag->filter('foo', null, \FILTER_CALLBACK, ['options' => function ($value) {
-            return strtoupper($value);
-        }]);
+        $result = $bag->filter('foo', null, \FILTER_CALLBACK, ['options' => strtoupper(...)]);
 
         $this->assertSame('BAR', $result);
     }
diff --git a/Tests/RequestMatcher/AttributesRequestMatcherTest.php b/Tests/RequestMatcher/AttributesRequestMatcherTest.php
@@ -26,9 +26,7 @@ public function test(string $key, string $regexp, bool $expected)
         $matcher = new AttributesRequestMatcher([$key => $regexp]);
         $request = Request::create('/admin/foo');
         $request->attributes->set('foo', 'foo_bar');
-        $request->attributes->set('_controller', function () {
-            return new Response('foo');
-        });
+        $request->attributes->set('_controller', fn () => new Response('foo'));
         $this->assertSame($expected, $matcher->matches($request));
     }
 
diff --git a/Tests/RequestMatcherTest.php b/Tests/RequestMatcherTest.php
@@ -173,9 +173,7 @@ public function testAttributesWithClosure()
         $matcher = new RequestMatcher();
 
         $request = Request::create('/admin/foo');
-        $request->attributes->set('_controller', function () {
-            return new Response('foo');
-        });
+        $request->attributes->set('_controller', fn () => new Response('foo'));
 
         $matcher->matchAttribute('_controller', 'babar');
         $this->assertFalse($matcher->matches($request));
diff --git a/Tests/RequestTest.php b/Tests/RequestTest.php
@@ -2139,9 +2139,7 @@ public function testSetTrustedHostsDoesNotBreakOnSpecialCharacters()
 
     public function testFactory()
     {
-        Request::setFactory(function (array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null) {
-            return new NewRequest();
-        });
+        Request::setFactory(fn (array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null) => new NewRequest());
 
         $this->assertEquals('foo', Request::create('/')->getFoo());
 
diff --git a/Tests/ResponseFunctionalTest.php b/Tests/ResponseFunctionalTest.php
@@ -44,7 +44,7 @@ public static function tearDownAfterClass(): void
     public function testCookie($fixture)
     {
         $result = file_get_contents(sprintf('http://localhost:8054/%s.php', $fixture));
-        $result = preg_replace_callback('/expires=[^;]++/', function ($m) { return str_replace('-', ' ', $m[0]); }, $result);
+        $result = preg_replace_callback('/expires=[^;]++/', fn ($m) => str_replace('-', ' ', $m[0]), $result);
         $this->assertStringMatchesFormatFile(__DIR__.sprintf('/Fixtures/response-functional/%s.expected', $fixture), $result);
     }
 
diff --git a/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php b/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
@@ -46,7 +46,7 @@ public function testSession($fixture)
         $context = ['http' => ['header' => "Cookie: sid=123abc\r\n"]];
         $context = stream_context_create($context);
         $result = file_get_contents(sprintf('http://localhost:8053/%s.php', $fixture), false, $context);
-        $result = preg_replace_callback('/expires=[^;]++/', function ($m) { return str_replace('-', ' ', $m[0]); }, $result);
+        $result = preg_replace_callback('/expires=[^;]++/', fn ($m) => str_replace('-', ' ', $m[0]), $result);
 
         $this->assertStringEqualsFile(__DIR__.sprintf('/Fixtures/%s.expected', $fixture), $result);
     }
diff --git a/Tests/Session/Storage/Handler/Fixtures/invalid_regenerate.php b/Tests/Session/Storage/Handler/Fixtures/invalid_regenerate.php
@@ -17,4 +17,4 @@
 echo empty($_SESSION) ? '$_SESSION is empty' : '$_SESSION is not empty';
 echo "\n";
 
-ob_start(function ($buffer) { return preg_replace('~_sf2_meta.*$~m', '', str_replace(session_id(), 'random_session_id', $buffer)); });
+ob_start(fn ($buffer) => preg_replace('~_sf2_meta.*$~m', '', str_replace(session_id(), 'random_session_id', $buffer)));
diff --git a/Tests/Session/Storage/Handler/Fixtures/regenerate.php b/Tests/Session/Storage/Handler/Fixtures/regenerate.php
@@ -7,4 +7,4 @@
 
 session_regenerate_id(true);
 
-ob_start(function ($buffer) { return str_replace(session_id(), 'random_session_id', $buffer); });
+ob_start(fn ($buffer) => str_replace(session_id(), 'random_session_id', $buffer));
diff --git a/Tests/Session/Storage/Handler/Fixtures/storage.php b/Tests/Session/Storage/Handler/Fixtures/storage.php
@@ -21,4 +21,4 @@
 
 echo empty($_SESSION) ? '$_SESSION is empty' : '$_SESSION is not empty';
 
-ob_start(function ($buffer) { return str_replace(session_id(), 'random_session_id', $buffer); });
+ob_start(fn ($buffer) => str_replace(session_id(), 'random_session_id', $buffer));
diff --git a/Tests/Session/Storage/Handler/Fixtures/with_samesite.php b/Tests/Session/Storage/Handler/Fixtures/with_samesite.php
@@ -10,4 +10,4 @@
 
 $_SESSION = ['foo' => 'bar'];
 
-ob_start(function ($buffer) { return str_replace(session_id(), 'random_session_id', $buffer); });
+ob_start(fn ($buffer) => str_replace(session_id(), 'random_session_id', $buffer));
diff --git a/Tests/Session/Storage/Handler/Fixtures/with_samesite_and_migration.php b/Tests/Session/Storage/Handler/Fixtures/with_samesite_and_migration.php
@@ -12,4 +12,4 @@
 
 $storage->regenerate(true);
 
-ob_start(function ($buffer) { return preg_replace('~_sf2_meta.*$~m', '', str_replace(session_id(), 'random_session_id', $buffer)); });
+ob_start(fn ($buffer) => preg_replace('~_sf2_meta.*$~m', '', str_replace(session_id(), 'random_session_id', $buffer)));
diff --git a/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php b/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
@@ -40,7 +40,7 @@ protected function setUp(): void
         }
 
         $r = new \ReflectionClass(\Memcached::class);
-        $methodsToMock = array_map(function ($m) { return $m->name; }, $r->getMethods(\ReflectionMethod::IS_PUBLIC));
+        $methodsToMock = array_map(fn ($m) => $m->name, $r->getMethods(\ReflectionMethod::IS_PUBLIC));
         $methodsToMock = array_diff($methodsToMock, ['getDelayed', 'getDelayedByKey']);
 
         $this->memcached = $this->getMockBuilder(\Memcached::class)
diff --git a/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -157,9 +157,7 @@ public function testReadLockedConvertsStreamToString()
         $selectStmt = $this->createMock(\PDOStatement::class);
         $insertStmt = $this->createMock(\PDOStatement::class);
 
-        $pdo->prepareResult = function ($statement) use ($selectStmt, $insertStmt) {
-            return str_starts_with($statement, 'INSERT') ? $insertStmt : $selectStmt;
-        };
+        $pdo->prepareResult = fn ($statement) => str_starts_with($statement, 'INSERT') ? $insertStmt : $selectStmt;
 
         $content = 'foobar';
         $stream = $this->createStream($content);
@@ -333,7 +331,7 @@ public function testConfigureSchemaDifferentDatabase()
         $schema = new Schema();
 
         $pdoSessionHandler = new PdoSessionHandler($this->getMemorySqlitePdo());
-        $pdoSessionHandler->configureSchema($schema, fn() => false);
+        $pdoSessionHandler->configureSchema($schema, fn () => false);
         $this->assertFalse($schema->hasTable('sessions'));
     }
 
@@ -342,7 +340,7 @@ public function testConfigureSchemaSameDatabase()
         $schema = new Schema();
 
         $pdoSessionHandler = new PdoSessionHandler($this->getMemorySqlitePdo());
-        $pdoSessionHandler->configureSchema($schema, fn() => true);
+        $pdoSessionHandler->configureSchema($schema, fn () => true);
         $this->assertTrue($schema->hasTable('sessions'));
     }
 
@@ -352,7 +350,7 @@ public function testConfigureSchemaTableExistsPdo()
         $schema->createTable('sessions');
 
         $pdoSessionHandler = new PdoSessionHandler($this->getMemorySqlitePdo());
-        $pdoSessionHandler->configureSchema($schema, fn() => true);
+        $pdoSessionHandler->configureSchema($schema, fn () => true);
         $table = $schema->getTable('sessions');
         $this->assertEmpty($table->getColumns(), 'The table was not overwritten');
     }
diff --git a/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php b/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php
@@ -72,7 +72,7 @@ public function testCreateRedisHandlerFromDsn()
         $ttlProperty = $reflection->getProperty('ttl');
         $this->assertSame(3600, $ttlProperty->getValue($handler));
 
-        $handler = SessionHandlerFactory::createHandler('redis://localhost?prefix=foo&ttl=3600&ignored=bar', ['ttl' => function () { return 123; }]);
+        $handler = SessionHandlerFactory::createHandler('redis://localhost?prefix=foo&ttl=3600&ignored=bar', ['ttl' => fn () => 123]);
 
         $this->assertInstanceOf(\Closure::class, $reflection->getProperty('ttl')->getValue($handler));
     }

Original file line number	Diff line number	Diff line change
`@@ -115,9 +115,7 @@ public function all(): array`
`115`	`115`	`*/`
`116`	`116`	`public function filter(string $pattern): self`
`117`	`117`	`{`
`118`		`- return new self(array_filter($this->items, function (AcceptHeaderItem $item) use ($pattern) {`
`119`		`- return preg_match($pattern, $item->getValue());`
`120`		`- }));`
	`118`	`+ return new self(array_filter($this->items, fn (AcceptHeaderItem $item) => preg_match($pattern, $item->getValue())));`
`121`	`119`	`}`
`122`	`120`
`123`	`121`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ protected function convertFileInformation(array\|UploadedFile $file): array\|Uploa`
`75`	`75`	`$file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['error'], false);`
`76`	`76`	`}`
`77`	`77`	`} else {`
`78`		`- $file = array_map(function ($v) { return $v instanceof UploadedFile \|\| \is_array($v) ? $this->convertFileInformation($v) : $v; }, $file);`
	`78`	`+ $file = array_map(fn ($v) => $v instanceof UploadedFile \|\| \is_array($v) ? $this->convertFileInformation($v) : $v, $file);`
`79`	`79`	`if (array_keys($keys) === $keys) {`
`80`	`80`	`$file = array_filter($file);`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -605,9 +605,7 @@ public static function getTrustedHeaderSet(): int`
`605`	`605`	`*/`
`606`	`606`	`public static function setTrustedHosts(array $hostPatterns)`
`607`	`607`	`{`
`608`		`- self::$trustedHostPatterns = array_map(function ($hostPattern) {`
`609`		`- return sprintf('{%s}i', $hostPattern);`
`610`		`- }, $hostPatterns);`
	`608`	`+ self::$trustedHostPatterns = array_map(fn ($hostPattern) => sprintf('{%s}i', $hostPattern), $hostPatterns);`
`611`	`609`	`// we need to reset trusted hosts on trusted host patterns change`
`612`	`610`	`self::$trustedHosts = [];`
`613`	`611`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,7 @@ public function matchIps(string\|array\|null $ips)`
`120`	`120`	`{`
`121`	`121`	`$ips = null !== $ips ? (array) $ips : [];`
`122`	`122`
`123`		`- $this->ips = array_reduce($ips, static function (array $ips, string $ip) {`
`124`		`- return array_merge($ips, preg_split('/\s,\s/', $ip));`
`125`		`- }, []);`
	`123`	`+ $this->ips = array_reduce($ips, static fn (array $ips, string $ip) => array_merge($ips, preg_split('/\s,\s/', $ip)), []);`
`126`	`124`	`}`
`127`	`125`
`128`	`126`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,7 @@ class IpsRequestMatcher implements RequestMatcherInterface`
`30`	`30`	`*/`
`31`	`31`	`public function __construct(array\|string $ips)`
`32`	`32`	`{`
`33`		`- $this->ips = array_reduce((array) $ips, static function (array $ips, string $ip) {`
`34`		`- return array_merge($ips, preg_split('/\s,\s/', $ip));`
`35`		`- }, []);`
	`33`	`+ $this->ips = array_reduce((array) $ips, static fn (array $ips, string $ip) => array_merge($ips, preg_split('/\s,\s/', $ip)), []);`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`public function matches(Request $request): bool`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,7 @@ class MethodRequestMatcher implements RequestMatcherInterface`
`32`	`32`	`*/`
`33`	`33`	`public function __construct(array\|string $methods)`
`34`	`34`	`{`
`35`		`- $this->methods = array_reduce(array_map('strtoupper', (array) $methods), static function (array $methods, string $method) {`
`36`		`- return array_merge($methods, preg_split('/\s,\s/', $method));`
`37`		`- }, []);`
	`35`	`+ $this->methods = array_reduce(array_map('strtoupper', (array) $methods), static fn (array $methods, string $method) => array_merge($methods, preg_split('/\s,\s/', $method)), []);`
`38`	`36`	`}`
`39`	`37`
`40`	`38`	`public function matches(Request $request): bool`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,7 @@ class SchemeRequestMatcher implements RequestMatcherInterface`
`32`	`32`	`*/`
`33`	`33`	`public function __construct(array\|string $schemes)`
`34`	`34`	`{`
`35`		`- $this->schemes = array_reduce(array_map('strtolower', (array) $schemes), static function (array $schemes, string $scheme) {`
`36`		`- return array_merge($schemes, preg_split('/\s,\s/', $scheme));`
`37`		`- }, []);`
	`35`	`+ $this->schemes = array_reduce(array_map('strtolower', (array) $schemes), static fn (array $schemes, string $scheme) => array_merge($schemes, preg_split('/\s,\s/', $scheme)), []);`
`38`	`36`	`}`
`39`	`37`
`40`	`38`	`public function matches(Request $request): bool`
Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,7 @@ protected function getCookie(Response $response): ?Cookie`
`69`	`69`	`{`
`70`	`70`	`$cookies = $response->headers->getCookies();`
`71`	`71`
`72`		`- $filteredCookies = array_filter($cookies, function (Cookie $cookie) {`
`73`		`- return $cookie->getName() === $this->name && $cookie->getPath() === $this->path && $cookie->getDomain() === $this->domain;`
`74`		`- });`
	`72`	`+ $filteredCookies = array_filter($cookies, fn (Cookie $cookie) => $cookie->getName() === $this->name && $cookie->getPath() === $this->path && $cookie->getDomain() === $this->domain);`
`75`	`73`
`76`	`74`	`return reset($filteredCookies) ?: null;`
`77`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,7 @@ private function getCookie(Response $response): ?Cookie`
`61`	`61`	`{`
`62`	`62`	`$cookies = $response->headers->getCookies();`
`63`	`63`
`64`		`- $filteredCookies = array_filter($cookies, function (Cookie $cookie) {`
`65`		`- return $cookie->getName() === $this->name && $cookie->getPath() === $this->path && $cookie->getDomain() === $this->domain;`
`66`		`- });`
	`64`	`+ $filteredCookies = array_filter($cookies, fn (Cookie $cookie) => $cookie->getName() === $this->name && $cookie->getPath() === $this->path && $cookie->getDomain() === $this->domain);`
`67`	`65`
`68`	`66`	`return reset($filteredCookies) ?: null;`
`69`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,7 @@ public function testFilterCallback()`
`64`	`64`	`public function testFilterClosure()`
`65`	`65`	`{`
`66`	`66`	`$bag = new InputBag(['foo' => 'bar']);`
`67`		`- $result = $bag->filter('foo', null, \FILTER_CALLBACK, ['options' => function ($value) {`
`68`		`- return strtoupper($value);`
`69`		`- }]);`
	`67`	`+ $result = $bag->filter('foo', null, \FILTER_CALLBACK, ['options' => strtoupper(...)]);`
`70`	`68`
`71`	`69`	`$this->assertSame('BAR', $result);`
`72`	`70`	`}`