Fix unit tests

Author: silverbackdan

src/ApiPlatform/Api/IriConverter.php

@@ -44,12 +44,14 @@ public function getIriFromResource($resource, int $referenceType = UrlGeneratorI
         $id = $resource->getId();
         if (!$id) {
             // id may not exist on object anymore. Deleting a page data resource with the route on will cascade,
-            //then mercure will want to publish the change with the IRI
+            // then mercure will want to publish the change with the IRI
             $parts = explode('/', $originalIri);
             array_pop($parts);
             $parts[] = $path;
-            return join('/', $parts);
+
+            return implode('/', $parts);
         }
+
         return str_replace($id->toString(), $path, $originalIri);
     }
 }

src/Helper/User/UserMailer.php

@@ -46,42 +46,49 @@ public function __construct(MailerInterface $mailer, ContainerInterface $contain
     public function sendPasswordResetEmail(AbstractUser $user): bool
     {
         $email = $this->container->get(PasswordResetEmailFactory::class)->create($user, $this->context);
+
         return $this->send($email);
     }
 
     public function sendChangeEmailConfirmationEmail(AbstractUser $user): bool
     {
         $email = $this->container->get(ChangeEmailConfirmationEmailFactory::class)->create($user, $this->context);
+
         return $this->send($email);
     }
 
     public function sendEmailVerifyEmail(AbstractUser $user): bool
     {
         $email = $this->container->get(VerifyEmailFactory::class)->create($user, $this->context);
+
         return $this->send($email);
     }
 
     public function sendWelcomeEmail(AbstractUser $user): bool
     {
         $email = $this->container->get(WelcomeEmailFactory::class)->create($user, $this->context);
+
         return $this->send($email);
     }
 
     public function sendUserEnabledEmail(AbstractUser $user): bool
     {
         $email = $this->container->get(UserEnabledEmailFactory::class)->create($user, $this->context);
+
         return $this->send($email);
     }
 
     public function sendUsernameChangedEmail(AbstractUser $user): bool
     {
         $email = $this->container->get(UsernameChangedEmailFactory::class)->create($user, $this->context);
+
         return $this->send($email);
     }
 
     public function sendPasswordChangedEmail(AbstractUser $user): bool
     {
         $email = $this->container->get(PasswordChangedEmailFactory::class)->create($user, $this->context);
+
         return $this->send($email);
     }
 
@@ -100,10 +107,12 @@ private function send(?RawMessage $message): bool
                 $logger->error($exception->getMessage(), [
                     'exception' => $exception,
                 ]);
+
                 return false;
             }
             throw $exception;
         }
+
         return true;
     }
 }

src/Resources/config/services.php

@@ -1190,7 +1190,7 @@
                     UsernameChangedEmailFactory::class => new Reference(UsernameChangedEmailFactory::class),
                     PasswordChangedEmailFactory::class => new Reference(PasswordChangedEmailFactory::class),
                     VerifyEmailFactory::class => new Reference(VerifyEmailFactory::class),
-                    'logger' => new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)
+                    'logger' => new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
                 ]),
                 '', // injected in dependency injection
             ]

src/Serializer/Normalizer/RouteNormalizer.php

@@ -66,6 +66,7 @@ public function normalize($object, $format = null, array $context = []): float|a
         $operationName = $context['operation_name'] ?? null;
         if ('_api_/routes_manifest/{id}{._format}_get' === $operationName) {
             $normalized['@id'] = str_replace('routes_manifest', 'routes', $normalized['@id']);
+
             return [
                 'resource_iris' => $this->getResourceIrisFromArray($normalized),
             ];
@@ -106,7 +107,7 @@ private function getResourceIrisFromArray(array $resource, array $iris = []): ar
             }
         }
 
-        return array_filter($iris, function($iri) {
+        return array_filter($iris, function ($iri) {
             return !str_contains($iri, '/.well-known/');
         });
     }

tests/Helper/User/UserMailerTest.php

@@ -13,11 +13,11 @@
 
 namespace Silverback\ApiComponentsBundle\Tests\Helper\User;
 
+use Monolog\Logger;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Silverback\ApiComponentsBundle\Entity\User\AbstractUser;
-use Silverback\ApiComponentsBundle\Exception\MailerTransportException;
 use Silverback\ApiComponentsBundle\Factory\User\Mailer\AbstractUserEmailFactory;
 use Silverback\ApiComponentsBundle\Factory\User\Mailer\ChangeEmailConfirmationEmailFactory;
 use Silverback\ApiComponentsBundle\Factory\User\Mailer\PasswordChangedEmailFactory;
@@ -96,7 +96,8 @@ public function test_exception_thrown_if_mailer_send_throws_exception(): void
         };
         $templateEmail = new TemplatedEmail();
 
-        $factoryMock = $this->getFactoryFromContainerMock(PasswordResetEmailFactory::class);
+        $loggerMock = $this->createMock(Logger::class);
+        $factoryMock = $this->getFactoryFromContainerMock(PasswordResetEmailFactory::class, [['logger', $loggerMock]]);
 
         $factoryMock
             ->expects(self::once())
@@ -111,7 +112,11 @@ public function test_exception_thrown_if_mailer_send_throws_exception(): void
             ->with($templateEmail)
             ->willThrowException($mockException);
 
-        $this->expectException(MailerTransportException::class);
+        $loggerMock
+            ->expects(self::once())
+            ->method('error')
+            ->with($mockException->getMessage());
+
         $this->userMailer->sendPasswordResetEmail($user);
     }
 
@@ -196,14 +201,26 @@ private function expectFactoryCallAndSendMailerMethod(string $factoryClass, Abst
         $this->expectMailerSendMethod($templateEmail);
     }
 
-    private function getFactoryFromContainerMock(string $factory): MockObject
+    private function getFactoryFromContainerMock(string $factory, array $additionalExpectations = []): MockObject
     {
         $factoryMock = $this->createMock(AbstractUserEmailFactory::class);
+        $expectations = [
+            [$factory, $factoryMock],
+            ...$additionalExpectations,
+        ];
+
+        $invokedCount = self::exactly(\count($expectations));
+
         $this->containerMock
-            ->expects(self::once())
+            ->expects($invokedCount)
             ->method('get')
-            ->with($factory)
-            ->willReturn($factoryMock);
+            ->willReturnCallback(function ($parameters) use ($invokedCount, $expectations) {
+                $currentInvocationCount = $invokedCount->numberOfInvocations();
+                $currentExpectation = $expectations[$currentInvocationCount - 1];
+                $this->assertSame($currentExpectation[0], $parameters);
+
+                return $currentExpectation[1];
+            });
 
         return $factoryMock;
     }