Refactor: Use fn where possible (#294)

tarlepp · Feb 14, 2020 · 48df51c · 48df51c
1 parent 0b0b995
commit 48df51c
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 65 deletions.
diff --git a/src/Command/ApiKey/ListApiKeysCommand.php b/src/Command/ApiKey/ListApiKeysCommand.php
@@ -103,13 +103,11 @@ private function getRows(): array
      */
     private function getFormatterApiKey(): Closure
     {
-        $userGroupFormatter = static function (UserGroup $userGroup): string {
-            return sprintf(
-                '%s (%s)',
-                $userGroup->getName(),
-                $userGroup->getRole()->getId()
-            );
-        };
+        $userGroupFormatter = fn (UserGroup $userGroup): string => sprintf(
+            '%s (%s)',
+            $userGroup->getName(),
+            $userGroup->getRole()->getId()
+        );
 
         return function (ApiKey $apiToken) use ($userGroupFormatter): array {
             return [

diff --git a/src/Command/User/ListUserGroupsCommand.php b/src/Command/User/ListUserGroupsCommand.php
@@ -99,14 +99,12 @@ private function getRows(): array
      */
     private function getFormatterUserGroup(): Closure
     {
-        $userFormatter = static function (User $user): string {
-            return sprintf(
-                '%s %s <%s>',
-                $user->getFirstName(),
-                $user->getLastName(),
-                $user->getEmail()
-            );
-        };
+        $userFormatter = fn (User $user): string => sprintf(
+            '%s %s <%s>',
+            $user->getFirstName(),
+            $user->getLastName(),
+            $user->getEmail()
+        );
 
         return static function (UserGroup $userGroup) use ($userFormatter): array {
             return [

diff --git a/src/Command/User/ListUsersCommand.php b/src/Command/User/ListUsersCommand.php
@@ -104,13 +104,11 @@ private function getRows(): array
      */
     private function getFormatterUser(): Closure
     {
-        $userGroupFormatter = static function (UserGroup $userGroup): string {
-            return sprintf(
-                '%s (%s)',
-                $userGroup->getName(),
-                $userGroup->getRole()->getId()
-            );
-        };
+        $userGroupFormatter = fn (UserGroup $userGroup): string => sprintf(
+            '%s (%s)',
+            $userGroup->getName(),
+            $userGroup->getRole()->getId()
+        );
 
         return function (User $user) use ($userGroupFormatter): array {
             return [

diff --git a/src/Command/Utils/CheckDependencies.php b/src/Command/Utils/CheckDependencies.php
@@ -131,9 +131,7 @@ private function getNamespaceDirectories(): array
          *
          * @return string
          */
-        $closure = static function (SplFileInfo $fileInfo): string {
-            return $fileInfo->getPath();
-        };
+        $closure = fn (SplFileInfo $fileInfo): string => $fileInfo->getPath();
 
         /** @var Traversable $iterator */
         $iterator = $finder->getIterator();

diff --git a/src/DTO/RestDto.php b/src/DTO/RestDto.php
@@ -86,9 +86,7 @@ public function getId(): ?string
      */
     public function getVisited(): array
     {
-        return array_filter($this->visited, static function (string $property) {
-            return $property !== 'id';
-        });
+        return array_filter($this->visited, fn (string $property): bool => $property !== 'id');
     }
 
     /**
@@ -201,11 +199,7 @@ private function getGetterMethod(RestDtoInterface $dto, string $property): ?stri
             'has' . ucfirst($property),
         ];
 
-        $filter = static function (string $method) use ($dto): bool {
-            return method_exists($dto, $method);
-        };
-
-        $getterMethods = array_filter($getters, $filter);
+        $getterMethods = array_filter($getters, fn (string $method): bool => method_exists($dto, $method));
 
         return $this->validateGetterMethod($property, $getterMethods);
     }

diff --git a/src/Entity/Traits/LogRequestProcessRequestTrait.php b/src/Entity/Traits/LogRequestProcessRequestTrait.php
@@ -512,8 +512,7 @@ private function determineParameters(Request $request): array
                 /** @var array<string, mixed> $output */
                 $output = JSON::decode($rawContent, true);
             } catch (JsonException $error) {
-                (static function (Throwable $error): void {
-                })($error);
+                (fn (Throwable $error): Throwable => $error)($error);
 
                 // Oh noes content isn't JSON so just parse it
                 $output = [];

diff --git a/src/Rest/RepositoryHelper.php b/src/Rest/RepositoryHelper.php
@@ -368,13 +368,14 @@ private static function getParameters(
             try {
                 $value = array_map([UuidHelper::class, 'getBytes'], $value);
             } catch (InvalidUuidStringException $exception) {
-                (static function (Throwable $exception): void {
-                })($exception);
+                (fn (Throwable $exception): Throwable => $exception)($exception);
             }
 
-            $parameters[] = array_map(static function (string $value) use ($queryBuilder): Literal {
-                return $queryBuilder->expr()->literal(is_numeric($value) ? (int)$value : $value);
-            }, $value);
+            $parameters[] = array_map(
+                fn (string $value): Literal =>
+                    $queryBuilder->expr()->literal(is_numeric($value) ? (int)$value : $value),
+                $value
+            );
         }
 
         return $parameters;

diff --git a/src/Rest/RequestHandler.php b/src/Rest/RequestHandler.php
@@ -253,17 +253,8 @@ private static function checkSearchTerms($searchTerms): void
      */
     private static function normalizeSearchTerms(array $searchTerms): array
     {
-        /**
-         * Lambda function to normalize JSON search terms.
-         *
-         * @param string|array $terms
-         */
-        $iterator = static function (array &$terms): void {
-            $terms = array_unique(array_values(array_filter($terms)));
-        };
-
         // Normalize user input, note that this support array and string formats on value
-        array_walk($searchTerms, $iterator);
+        array_walk($searchTerms, fn (array $terms): array => array_unique(array_values(array_filter($terms))));
 
         return $searchTerms;
     }

diff --git a/src/Rest/ResponseHandler.php b/src/Rest/ResponseHandler.php
@@ -198,12 +198,7 @@ private function checkPopulateAll(
         // Set all associations to be populated
         if ($populateAll && count($populate) === 0) {
             $associations = $restResource->getAssociations();
-
-            $iterator = static function (string $assocName) use ($entityName): string {
-                return $entityName . '.' . $assocName;
-            };
-
-            $populate = array_map($iterator, $associations);
+            $populate = array_map(fn (string $assocName): string => $entityName . '.' . $assocName, $associations);
         }
 
         return $populate;

diff --git a/src/Rest/SearchTerm.php b/src/Rest/SearchTerm.php
@@ -124,13 +124,9 @@ private static function getColumnIterator(string $term, int $mode): Closure
          *
          * @return string[]
          */
-        return static function (string $column) use ($term, $mode): array {
-            if (strpos($column, '.') === false) {
-                $column = 'entity.' . $column;
-            }
-
-            return [$column, 'like', self::getTerm($mode, $term)];
-        };
+        return fn (string $column): array => [
+            strpos($column, '.') === false ? 'entity.' . $column : $column, 'like', self::getTerm($mode, $term)
+        ];
     }
 
     /**

diff --git a/src/Rest/UuidHelper.php b/src/Rest/UuidHelper.php
@@ -61,8 +61,7 @@ public static function getType(string $value): ?string
             $output = UuidBinaryOrderedTimeType::NAME;
         } catch (InvalidUuidStringException $exception) {
             // ok, so now we know that value isn't uuid
-            (static function (Throwable $exception): void {
-            })($exception);
+            (fn (Throwable $exception): Throwable => $exception)($exception);
         }
 
         return $output;