Use arrow function when possible

rgomezcasas · rgomezcasas · commit fbd65c83ed9a · 2020-06-03T14:53:09.000+02:00
diff --git a/apps/backoffice/backend/src/BackofficeBackendKernel.php b/apps/backoffice/backend/src/BackofficeBackendKernel.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace CodelyTv\Apps\Backoffice\Backend;
 
diff --git a/apps/backoffice/backend/src/Controller/Courses/CoursesGetController.php b/apps/backoffice/backend/src/Controller/Courses/CoursesGetController.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace CodelyTv\Apps\Backoffice\Backend\Controller\Courses;
 
@@ -35,20 +35,16 @@ public function __invoke(Request $request): JsonResponse
         );
 
         return new JsonResponse(
-            map($this->toArray(), $response->courses()),
+            map(
+                fn(BackofficeCourseResponse $course) => [
+                    'id'       => $course->id(),
+                    'name'     => $course->name(),
+                    'duration' => $course->duration(),
+                ],
+                $response->courses()
+            ),
             200,
             ['Access-Control-Allow-Origin' => '*']
         );
     }
-
-    private function toArray(): callable
-    {
-        return static function (BackofficeCourseResponse $course) {
-            return [
-                'id'       => $course->id(),
-                'name'     => $course->name(),
-                'duration' => $course->duration(),
-            ];
-        };
-    }
 }
diff --git a/apps/backoffice/backend/src/Controller/HealthCheck/HealthCheckGetController.php b/apps/backoffice/backend/src/Controller/HealthCheck/HealthCheckGetController.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace CodelyTv\Apps\Backoffice\Backend\Controller\HealthCheck;
 
diff --git a/apps/backoffice/frontend/src/BackofficeFrontendKernel.php b/apps/backoffice/frontend/src/BackofficeFrontendKernel.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace CodelyTv\Apps\Backoffice\Frontend;
 
diff --git a/apps/backoffice/frontend/src/Command/ImportCoursesToElasticsearchCommand.php b/apps/backoffice/frontend/src/Command/ImportCoursesToElasticsearchCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace CodelyTv\Apps\Backoffice\Frontend\Command;
 
diff --git a/apps/backoffice/frontend/src/Controller/Courses/CoursesGetWebController.php b/apps/backoffice/frontend/src/Controller/Courses/CoursesGetWebController.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace CodelyTv\Apps\Backoffice\Frontend\Controller\Courses;
 
diff --git a/apps/backoffice/frontend/src/Controller/Courses/CoursesPostWebController.php b/apps/backoffice/frontend/src/Controller/Courses/CoursesPostWebController.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace CodelyTv\Apps\Backoffice\Frontend\Controller\Courses;
 
diff --git a/apps/backoffice/frontend/src/Controller/HealthCheck/HealthCheckGetController.php b/apps/backoffice/frontend/src/Controller/HealthCheck/HealthCheckGetController.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace CodelyTv\Apps\Backoffice\Frontend\Controller\HealthCheck;
 
diff --git a/apps/backoffice/frontend/src/Controller/Home/HomeGetWebController.php b/apps/backoffice/frontend/src/Controller/Home/HomeGetWebController.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace CodelyTv\Apps\Backoffice\Frontend\Controller\Home;
 
diff --git a/apps/mooc/backend/src/Command/DomainEvents/MySql/ConsumeMySqlDomainEventsCommand.php b/apps/mooc/backend/src/Command/DomainEvents/MySql/ConsumeMySqlDomainEventsCommand.php
@@ -44,7 +44,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void
     {
         $quantityEventsToProcess = (int) $input->getArgument('quantity');
 
-        $consumer = pipe($this->consumer(), $this->clearConnections());
+        $consumer = pipe($this->consumer(), fn() => $this->connections->clear());
 
         $this->consumer->consume($consumer, $quantityEventsToProcess);
     }
@@ -59,11 +59,4 @@ private function consumer(): callable
             }
         };
     }
-
-    private function clearConnections(): callable
-    {
-        return function () {
-            $this->connections->clear();
-        };
-    }
 }
diff --git a/src/Mooc/CoursesCounter/Infrastructure/Persistence/Doctrine/CourseIdsType.php b/src/Mooc/CoursesCounter/Infrastructure/Persistence/Doctrine/CourseIdsType.php
@@ -25,27 +25,13 @@ public function getName(): string
     /** @var CourseId[] $value */
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
-        return parent::convertToDatabaseValue(map($this->values(), $value), $platform);
+        return parent::convertToDatabaseValue(map(fn(CourseId $id) => $id->value(), $value), $platform);
     }
 
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
         $scalars = parent::convertToPHPValue($value, $platform);
 
-        return map($this->toCourseId(), $scalars);
-    }
-
-    private function values()
-    {
-        return static function (CourseId $id) {
-            return $id->value();
-        };
-    }
-
-    private function toCourseId()
-    {
-        return static function (string $value) {
-            return new CourseId($value);
-        };
+        return map(fn(string $value) => new CourseId($value), $scalars);
     }
 }
diff --git a/src/Shared/Infrastructure/Doctrine/DatabaseConnections.php b/src/Shared/Infrastructure/Doctrine/DatabaseConnections.php
@@ -11,7 +11,7 @@
 
 final class DatabaseConnections
 {
-    private array $connections = [];
+    private array $connections;
 
     public function __construct(iterable $connections)
     {
@@ -20,25 +20,11 @@ public function __construct(iterable $connections)
 
     public function clear(): void
     {
-        each($this->clearer(), $this->connections);
-    }
-
-    public function allConnectionsClearer(): callable
-    {
-        return function (): void {
-            $this->clear();
-        };
+        each(fn(EntityManager $entityManager) => $entityManager->clear(), $this->connections);
     }
 
     public function truncate(): void
     {
         apply(new DatabaseCleaner(), array_values($this->connections));
     }
-
-    private function clearer(): callable
-    {
-        return static function (EntityManager $entityManager) {
-            $entityManager->clear();
-        };
-    }
 }
diff --git a/src/Shared/Infrastructure/Symfony/ApiController.php b/src/Shared/Infrastructure/Symfony/ApiController.php
@@ -15,18 +15,19 @@ abstract class ApiController
 {
     private QueryBus                           $queryBus;
     private CommandBus                         $commandBus;
-    private ApiExceptionsHttpStatusCodeMapping $exceptionHandler;
 
     public function __construct(
         QueryBus $queryBus,
         CommandBus $commandBus,
         ApiExceptionsHttpStatusCodeMapping $exceptionHandler
     ) {
-        $this->queryBus         = $queryBus;
-        $this->commandBus       = $commandBus;
-        $this->exceptionHandler = $exceptionHandler;
+        $this->queryBus   = $queryBus;
+        $this->commandBus = $commandBus;
 
-        each($this->exceptionRegistrar(), $this->exceptions());
+        each(
+            fn(int $httpCode, string $exceptionClass) => $exceptionHandler->register($exceptionClass, $httpCode),
+            $this->exceptions()
+        );
     }
 
     abstract protected function exceptions(): array;
@@ -40,11 +41,4 @@ protected function dispatch(Command $command): void
     {
         $this->commandBus->dispatch($command);
     }
-
-    private function exceptionRegistrar(): callable
-    {
-        return function ($httpCode, $exception): void {
-            $this->exceptionHandler->register($exception, $httpCode);
-        };
-    }
 }
diff --git a/tests/src/Shared/Infrastructure/Bus/Event/MySql/MySqlDoctrineEventBusTest.php b/tests/src/Shared/Infrastructure/Bus/Event/MySql/MySqlDoctrineEventBusTest.php
@@ -38,15 +38,8 @@ public function it_should_publish_and_consume_domain_events_from_msql(): void
         $this->bus->publish($domainEvent, $anotherDomainEvent);
 
         $this->consumer->consume(
-            $this->spySubscriber($domainEvent, $anotherDomainEvent),
+            fn(DomainEvent ...$expectedEvents) => $this->assertContainsEquals($domainEvent, $expectedEvents),
             $eventsToConsume = 2
         );
     }
-
-    private function spySubscriber(DomainEvent ...$expectedDomainEvents): callable
-    {
-        return function (DomainEvent $domainEvent) use ($expectedDomainEvents): void {
-            $this->assertContainsEquals($domainEvent, $expectedDomainEvents);
-        };
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void`
`44`	`44`	`{`
`45`	`45`	`$quantityEventsToProcess = (int) $input->getArgument('quantity');`
`46`	`46`
`47`		`- $consumer = pipe($this->consumer(), $this->clearConnections());`
	`47`	`+ $consumer = pipe($this->consumer(), fn() => $this->connections->clear());`
`48`	`48`
`49`	`49`	`$this->consumer->consume($consumer, $quantityEventsToProcess);`
`50`	`50`	`}`
`@@ -59,11 +59,4 @@ private function consumer(): callable`
`59`	`59`	`}`
`60`	`60`	`};`
`61`	`61`	`}`
`62`		`-`
`63`		`- private function clearConnections(): callable`
`64`		`- {`
`65`		`- return function () {`
`66`		`- $this->connections->clear();`
`67`		`- };`
`68`		`- }`
`69`	`62`	`}`