Simplify anonymous functions that could be expressions

src/Discord/Discord.php

@@ -545,9 +545,7 @@ protected function handleReady(object $data)
         }
 
         // Emit ready after 60 seconds
-        $this->loop->addTimer(60, function () {
-            $this->ready();
-        });
+        $this->loop->addTimer(60, fn () => $this->ready());
 
         $guildLoad = new Deferred();
 
@@ -849,9 +847,7 @@ public function handleWsConnectionFailed(\Throwable $e): void
     {
         $this->logger->error('failed to connect to websocket, retry in 5 seconds', ['e' => $e->getMessage()]);
 
-        $this->loop->addTimer(5, function () {
-            $this->connectWs();
-        });
+        $this->loop->addTimer(5, fn () => $this->connectWs());
     }
 
     /**
@@ -1367,9 +1363,7 @@ public function connectWs(): void
                 $this->logger->debug('session data received', ['session' => $session]);
                 if ($session['remaining'] < 2) {
                     $this->logger->error('exceeded number of reconnects allowed, waiting before attempting reconnect', $session);
-                    $this->loop->addTimer($session['reset_after'] / 1000, function () {
-                        $this->connectWs();
-                    });
+                    $this->loop->addTimer($session['reset_after'] / 1000, fn () => $this->connectWs());
 
                     return;
                 }

src/Discord/Helpers/Buffer.php

@@ -124,13 +124,9 @@ public function read(int $length, ?string $format = null, ?int $timeout = -1): P
             $this->reads[] = [$deferred, $length];
 
             if ($timeout > 0 && $this->loop !== null) {
-                $timer = $this->loop->addTimer($timeout / 1000, function () use ($deferred) {
-                    $deferred->reject(new BufferTimedOutException());
-                });
+                $timer = $this->loop->addTimer($timeout / 1000, fn () => $deferred->reject(new BufferTimedOutException()));
 
-                $deferred->promise()->then(function () use ($timer) {
-                    $this->loop->cancelTimer($timer);
-                });
+                $deferred->promise()->then(fn () => $this->loop->cancelTimer($timer));
             } elseif ($timeout === 0) {
                 $deferred->reject(new BufferTimedOutException());
             }

src/Discord/Parts/Channel/Message.php

@@ -523,9 +523,7 @@ protected function getGuildAttribute(): ?Guild
 
         // Workaround for Channel::sendMessage() no guild_id
         if ($this->channel_id) {
-            return $this->discord->guilds->find(function (Guild $guild) {
-                return $guild->channels->offsetExists($this->channel_id);
-            });
+            return $this->discord->guilds->find(fn (Guild $guild) => $guild->channels->offsetExists($this->channel_id));
         }
 
         return null;

src/Discord/Parts/Channel/Message/MessageReference.php

@@ -122,9 +122,7 @@ protected function getGuildAttribute(): ?Guild
 
         // Workaround for Channel::sendMessage() no guild_id
         if ($this->channel_id) {
-            return $this->discord->guilds->find(function (Guild $guild) {
-                return $guild->channels->offsetExists($this->channel_id);
-            });
+            return $this->discord->guilds->find(fn (Guild $guild) => $guild->channels->offsetExists($this->channel_id));
         }
 
         return null;

src/Discord/Parts/Guild/AuditLog/AuditLog.php

@@ -185,8 +185,6 @@ public function searchByType(int $action_type): ExCollectionInterface
             throw new \InvalidArgumentException("The given action type `{$action_type}` is not valid.");
         }
 
-        return $this->audit_log_entries->filter(function (Entry $entry) use ($action_type) {
-            return $entry->action_type === $action_type;
-        });
+        return $this->audit_log_entries->filter(fn (Entry $entry) => $entry->action_type === $action_type);
     }
 }

src/Discord/Parts/Guild/Emoji.php

@@ -89,9 +89,7 @@ protected function getRolesAttribute(): ExCollectionInterface
         $roles->fill(array_fill_keys($this->attributes['roles'], null));
 
         if ($guild = $this->guild) {
-            $roles->merge($guild->roles->filter(function ($role) {
-                return in_array($role->id, $this->attributes['roles']);
-            }));
+            $roles->merge($guild->roles->filter(fn ($role) => in_array($role->id, $this->attributes['roles'])));
         }
 
         return $roles;

src/Discord/Parts/Guild/Guild.php

@@ -1000,9 +1000,7 @@ public function transferOwnership($member, ?string $reason = null): PromiseInter
     public function validateRegion(): PromiseInterface
     {
         return $this->getVoiceRegions()->then(function () {
-            $regions = $this->regions->map(function ($region) {
-                return $region->id;
-            })->jsonSerialize();
+            $regions = $this->regions->map(fn ($region) => $region->id)->jsonSerialize();
 
             if (! in_array($this->region, $regions)) {
                 return self::REGION_DEFAULT;

src/Discord/Parts/Guild/Sticker.php

@@ -78,9 +78,7 @@ class Sticker extends Part implements Stringable
      */
     public function isPartial(): bool
     {
-        $partial = array_filter($this->attributes, function ($var) {
-            return isset($var);
-        });
+        $partial = array_filter($this->attributes, fn ($var) => isset($var));
 
         sort($partial);
 

src/Discord/Repository/Guild/MemberRepository.php

@@ -196,9 +196,7 @@ public function freshen(?array $queryparams = null): PromiseInterface
                     $lastValueId = $value->user->id;
                 }
 
-                $this->cacheFreshen($response)->then(function () use ($paginate, $lastValueId) {
-                    $paginate($lastValueId);
-                });
+                $this->cacheFreshen($response)->then(fn () => $paginate($lastValueId));
             }, [$deferred, 'reject']);
         })();
 

src/Discord/Repository/Monetization/SubscriptionRepository.php

@@ -67,9 +67,10 @@ public function getSubscriptions(array $options = [])
         $resolver->setAllowedTypes('before', ['string', 'int', 'null']);
         $resolver->setAllowedTypes('after', ['string', 'int', 'null']);
         $resolver->setAllowedTypes('limit', ['int', 'null']);
-        $resolver->setAllowedValues('limit', function ($value) {
-            return $value === null || ($value >= 1 && $value <= 100);
-        });
+        $resolver->setAllowedValues(
+            'limit',
+            fn ($value) => $value === null || ($value >= 1 && $value <= 100)
+        );
 
         $options = $resolver->resolve($options);
 

src/Discord/Voice/OggPage.php

@@ -97,18 +97,16 @@ public static function fromBuffer(Buffer $buffer, ?int $timeout = -1): PromiseIn
                 return $buffer->read($data, timeout: $timeout);
             })
             // Reading segment data
-            ->then(function ($data) use (&$header, &$pageSegments) {
-                return new OggPage(
-                    $header['version'],
-                    $header['header_type'],
-                    $header['granule_position'],
-                    $header['bitstream_sn'],
-                    $header['page_seq'],
-                    $header['csum'],
-                    $pageSegments,
-                    $data
-                );
-            });
+            ->then(fn ($data) => new OggPage(
+                $header['version'],
+                $header['header_type'],
+                $header['granule_position'],
+                $header['bitstream_sn'],
+                $header['page_seq'],
+                $header['csum'],
+                $pageSegments,
+                $data
+            ));
     }
 
     /**

src/Discord/Voice/ReceiveStream.php

@@ -241,15 +241,11 @@ public function pipePCM(WritableStreamInterface $dest, array $options = []): voi
             }
         });
 
-        $dest->on('drain', function () {
-            $this->resume();
-        });
+        $dest->on('drain', fn () => $this->resume());
 
         $end = isset($options['end']) ? $options['end'] : true;
         if ($end && $this !== $dest) {
-            $this->on('end', function () use ($dest) {
-                $dest->end();
-            });
+            $this->on('end', fn () => $dest->end());
         }
     }
 
@@ -273,15 +269,11 @@ public function pipeOpus(WritableStreamInterface $dest, array $options = []): vo
             }
         });
 
-        $dest->on('drain', function () {
-            $this->resume();
-        });
+        $dest->on('drain', fn () => $this->resume());
 
         $end = isset($options['end']) ? $options['end'] : true;
         if ($end && $this !== $dest) {
-            $this->on('end', function () use ($dest) {
-                $dest->end();
-            });
+            $this->on('end', fn () => $dest->end());
         }
     }
 }

src/Discord/WebSockets/Events/GuildCreate.php

@@ -113,9 +113,7 @@ public function handle($data)
             $await[] = $guildPart->sounds->cache->set($sound->sound_id, $guildPart->sounds->create($sound, true));
         }
 
-        $all = yield all($await)->then(function () use (&$guildPart) {
-            return $this->discord->guilds->cache->set($guildPart->id, $guildPart)->then(fn ($success) => $guildPart);
-        });
+        $all = yield all($await)->then(fn () => $this->discord->guilds->cache->set($guildPart->id, $guildPart)->then(fn ($success) => $guildPart));
 
         if (
             (

src/Discord/functions.php

@@ -278,9 +278,7 @@ function escapeMarkdown(string $text): string
 function deferFind($array, callable $callback, $loop = null): PromiseInterface
 {
     $cancelled = false;
-    $deferred = new Deferred(function () use (&$cancelled) {
-        $cancelled = true;
-    });
+    $deferred = new Deferred(fn () => $cancelled = true);
     $iterator = new ArrayIterator($array);
 
     $loop ??= Loop::get();