Fix .{_format} to {._format}

Author: silverbackdan

features/user/me.feature

@@ -12,7 +12,7 @@ Feature: Add a /me endpoint
     When I send a "GET" request to "/me"
     Then the response status code should be 200
     And the JSON should be valid according to the schema file "user.schema.json"
-    And the JSON node "_metadata.mercureSubscribeTopics[0]" should be equal to "http://example.com:80/_/component_groups/{id}.{_format}"
+    And the JSON node "_metadata.mercureSubscribeTopics[0]" should be equal to "http://example.com:80/_/component_groups/{id}{._format}"
 
   Scenario: I can retrieve the current logged in user object
     When I send a "GET" request to "/me"

src/ApiPlatform/Metadata/Resource/UserResourceMetadataCollectionFactory.php

@@ -49,7 +49,7 @@ public function create(string $resourceClass): ResourceMetadataCollection
             if ($operations) {
                 foreach ($operations as $operation) {
                     if ($operation instanceof Get) {
-                        $newOperation = (new HttpOperation(HttpOperation::METHOD_GET, '/me.{_format}'))
+                        $newOperation = (new HttpOperation(HttpOperation::METHOD_GET, '/me{._format}'))
                             ->withShortName($operation->getShortName());
                         $operations->add(
                             'me',

src/Command/UserCreateCommand.php

@@ -13,7 +13,6 @@
 
 namespace Silverback\ApiComponentsBundle\Command;
 
-use Exception;
 use Silverback\ApiComponentsBundle\Factory\User\UserFactory;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -139,7 +138,7 @@ private static function getNotEmptyValidator(string $label): callable
     {
         return static function (string $string) use ($label) {
             if (empty($string)) {
-                throw new Exception($label . ' can not be empty');
+                throw new \Exception($label . ' can not be empty');
             }
 
             return $string;

src/DependencyInjection/SilverbackApiComponentsExtension.php

@@ -13,7 +13,6 @@
 
 namespace Silverback\ApiComponentsBundle\DependencyInjection;
 
-use Exception;
 use Ramsey\Uuid\Doctrine\UuidType;
 use Silverback\ApiComponentsBundle\AttributeReader\UploadableAttributeReader;
 use Silverback\ApiComponentsBundle\Doctrine\Extension\ORM\RoutableExtension;
@@ -64,7 +63,7 @@
 class SilverbackApiComponentsExtension extends Extension implements PrependExtensionInterface
 {
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     public function load(array $configs, ContainerBuilder $container): void
     {
@@ -229,7 +228,7 @@ private function setMailerServiceArguments(ContainerBuilder $container, array $c
     }
 
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     private function loadServiceConfig(ContainerBuilder $container): void
     {

src/Entity/Core/Route.php

@@ -62,9 +62,9 @@
 #[Patch(requirements: REQUIREMENTS, security: SECURITY)]
 #[Get(requirements: ['id' => "(?!.+\/redirects$).+"], security: SECURITY)]
 // Custom endpoints
-#[Post(uriTemplate: '/routes/generate.{_format}', validationContext: ['groups' => ['Route:generate:write']])]
-#[Get(uriTemplate: '/routes/{id}/redirects.{_format}', defaults: ['_api_item_operation_name' => 'route_redirects'], requirements: REQUIREMENTS, normalizationContext: ['groups' => ['Route:redirect:read']], security: SECURITY)]
-#[Get(uriTemplate: '/routes_manifest/{id}.{_format}', defaults: ['_api_item_operation_name' => 'route_resources'], requirements: REQUIREMENTS, normalizationContext: ['groups' => ['Route:manifest:read']], security: SECURITY)]
+#[Post(uriTemplate: '/routes/generate{._format}', validationContext: ['groups' => ['Route:generate:write']])]
+#[Get(uriTemplate: '/routes/{id}/redirects{._format}', defaults: ['_api_item_operation_name' => 'route_redirects'], requirements: REQUIREMENTS, normalizationContext: ['groups' => ['Route:redirect:read']], security: SECURITY)]
+#[Get(uriTemplate: '/routes_manifest/{id}{._format}', defaults: ['_api_item_operation_name' => 'route_resources'], requirements: REQUIREMENTS, normalizationContext: ['groups' => ['Route:manifest:read']], security: SECURITY)]
 #[Silverback\Timestamped]
 class Route
 {

src/Entity/User/AbstractUser.php

@@ -14,7 +14,6 @@
 namespace Silverback\ApiComponentsBundle\Entity\User;
 
 use ApiPlatform\Metadata\ApiProperty;
-use DateTime;
 use Lexik\Bundle\JWTAuthenticationBundle\Security\User\JWTUserInterface;
 use Ramsey\Uuid\Uuid;
 use Silverback\ApiComponentsBundle\Annotation as Silverback;
@@ -74,15 +73,15 @@ abstract class AbstractUser implements SymfonyUserInterface, PasswordAuthenticat
     public ?string $plainNewPasswordConfirmationToken = null;
 
     #[ApiProperty(readable: false, writable: false)]
-    protected ?DateTime $passwordRequestedAt = null;
+    protected ?\DateTime $passwordRequestedAt = null;
 
     #[UserPassword(message: 'You have not entered your current password correctly. Please try again.', groups: ['User:password:change'])]
     #[ApiProperty(readable: false)]
     #[Groups(['User:input'])]
     protected ?string $oldPassword = null;
 
     #[ApiProperty(readable: false, writable: false)]
-    protected ?DateTime $passwordUpdatedAt = null;
+    protected ?\DateTime $passwordUpdatedAt = null;
 
     #[Assert\NotBlank(allowNull: true, groups: ['User:emailAddress', 'Default'])]
     #[Assert\Email]
@@ -97,7 +96,7 @@ abstract class AbstractUser implements SymfonyUserInterface, PasswordAuthenticat
 
     #[ApiProperty(readable: false, writable: false)]
     #[Groups(['User:output'])]
-    protected ?DateTime $newEmailAddressChangeRequestedAt = null;
+    protected ?\DateTime $newEmailAddressChangeRequestedAt = null;
 
     #[ApiProperty(readable: false, writable: false)]
     public ?string $plainNewEmailConfirmationToken = null;
@@ -115,7 +114,7 @@ abstract class AbstractUser implements SymfonyUserInterface, PasswordAuthenticat
     public ?string $plainEmailAddressVerifyToken = null;
 
     #[ApiProperty(readable: false, writable: false)]
-    protected ?DateTime $emailLastUpdatedAt = null;
+    protected ?\DateTime $emailLastUpdatedAt = null;
 
     /**
      * `final` to make `createFromPayload` safe. Could instead make an interface? Or abstract and force child to define constructor?
@@ -221,12 +220,12 @@ public function setNewPasswordConfirmationToken(?string $newPasswordConfirmation
         return $this;
     }
 
-    public function getPasswordRequestedAt(): ?DateTime
+    public function getPasswordRequestedAt(): ?\DateTime
     {
         return $this->passwordRequestedAt;
     }
 
-    public function setPasswordRequestedAt(?DateTime $passwordRequestedAt): self
+    public function setPasswordRequestedAt(?\DateTime $passwordRequestedAt): self
     {
         $this->passwordRequestedAt = $passwordRequestedAt;
 
@@ -272,7 +271,7 @@ public function setNewEmailConfirmationToken(?string $newEmailConfirmationToken)
         return $this;
     }
 
-    public function getNewEmailAddressChangeRequestedAt(): ?DateTime
+    public function getNewEmailAddressChangeRequestedAt(): ?\DateTime
     {
         return $this->newEmailAddressChangeRequestedAt;
     }
@@ -303,7 +302,7 @@ public function isPasswordRequestLimitReached($ttl): bool
     {
         $lastRequest = $this->getPasswordRequestedAt();
 
-        return $lastRequest instanceof DateTime &&
+        return $lastRequest instanceof \DateTime &&
             $lastRequest->getTimestamp() + $ttl > time();
     }
 

src/Entity/User/UserInterface.php

@@ -13,10 +13,9 @@
 
 namespace Silverback\ApiComponentsBundle\Entity\User;
 
-use Serializable;
 use Symfony\Component\Security\Core\User\UserInterface as BaseUserInterface;
 
-interface UserInterface extends Serializable, BaseUserInterface
+interface UserInterface extends \Serializable, BaseUserInterface
 {
     public function getId(): ?int;
 

src/Entity/Utility/TimestampedTrait.php

@@ -13,20 +13,17 @@
 
 namespace Silverback\ApiComponentsBundle\Entity\Utility;
 
-use DateTime;
-use DateTimeImmutable;
-
 /**
  * @author Daniel West <daniel@silverback.is>
  */
 trait TimestampedTrait
 {
-    public ?DateTimeImmutable $createdAt = null;
+    public ?\DateTimeImmutable $createdAt = null;
 
-    public ?DateTime $modifiedAt = null;
+    public ?\DateTime $modifiedAt = null;
 
     /** @return static */
-    public function setCreatedAt(DateTimeImmutable $createdAt)
+    public function setCreatedAt(\DateTimeImmutable $createdAt)
     {
         if (!$this->createdAt) {
             $this->createdAt = $createdAt;
@@ -35,20 +32,20 @@ public function setCreatedAt(DateTimeImmutable $createdAt)
         return $this;
     }
 
-    public function getCreatedAt(): ?DateTimeImmutable
+    public function getCreatedAt(): ?\DateTimeImmutable
     {
         return $this->createdAt;
     }
 
     /** @return static */
-    public function setModifiedAt(DateTime $modifiedAt)
+    public function setModifiedAt(\DateTime $modifiedAt)
     {
         $this->modifiedAt = $modifiedAt;
 
         return $this;
     }
 
-    public function getModifiedAt(): ?DateTime
+    public function getModifiedAt(): ?\DateTime
     {
         return $this->modifiedAt;
     }

src/EventListener/Api/RouteEventListener.php

@@ -43,7 +43,7 @@ public function onPostValidate(ViewEvent $event): void
         if (
             empty($data) ||
             !$data instanceof Route ||
-            '_api_/routes/generate.{_format}_post' !== $operationName
+            '_api_/routes/generate{._format}_post' !== $operationName
         ) {
             return;
         }

src/Helper/Form/FormCachePurger.php

@@ -13,9 +13,7 @@
 
 namespace Silverback\ApiComponentsBundle\Helper\Form;
 
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
-use ReflectionClass;
 use Silverback\ApiComponentsBundle\Entity\Component\Form;
 use Silverback\ApiComponentsBundle\Event\CommandLogEvent;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -63,8 +61,8 @@ public function clear($cacheDir = null): void
     private function updateFormTimestamp(Form $form): void
     {
         $formClass = $form->formType;
-        $reflector = new ReflectionClass($formClass);
-        $dateTime = new DateTime();
+        $reflector = new \ReflectionClass($formClass);
+        $dateTime = new \DateTime();
         $timestamp = filemtime($reflector->getFileName());
 
         $this->dispatcher->dispatch(new CommandLogEvent(sprintf('<info>Checking timestamp for %s</info>', $formClass)));