Chore(deps) - Doctrine major update

composer.json

@@ -28,7 +28,7 @@
 		"ext-random": "*",
 		"doctrine/doctrine-bundle": "2.13.0",
 		"doctrine/doctrine-migrations-bundle": "3.3.1",
-		"doctrine/orm": "2.20.0",
+		"doctrine/orm": "3.3.0",
 		"friendsofphp/proxy-manager-lts": "1.0.18",
 		"gedmo/doctrine-extensions": "3.17.1",
 		"lexik/jwt-authentication-bundle": "3.1.0",

config/packages/doctrine.yaml

@@ -12,6 +12,7 @@ doctrine:
             EnumLanguage: App\Doctrine\DBAL\Types\EnumLanguageType
             EnumLocale: App\Doctrine\DBAL\Types\EnumLocaleType
             EnumLogLogin: App\Doctrine\DBAL\Types\EnumLogLoginType
+            PrimaryString: App\Doctrine\DBAL\Types\PrimaryStringType
         profiling_collect_backtrace: '%kernel.debug%'
         #use_savepoints: true
         # IMPORTANT: You MUST configure your server version,

src/Doctrine/DBAL/Types/EnumType.php

@@ -11,7 +11,7 @@
 use App\Enum\Interfaces\DatabaseEnumInterface;
 use BackedEnum;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Types\ConversionException;
+use Doctrine\DBAL\Types\Exception\InvalidFormat;
 use Doctrine\DBAL\Types\Type;
 use InvalidArgumentException;
 use Override;
@@ -20,6 +20,7 @@
 use function implode;
 use function in_array;
 use function is_string;
+use function sprintf;
 
 /**
  * @package App\Doctrine\DBAL\Types
@@ -89,21 +90,10 @@ public function convertToPHPValue($value, AbstractPlatform $platform): DatabaseE
             return $enum;
         }
 
-        throw ConversionException::conversionFailedFormat(
+        throw InvalidFormat::new(
             gettype($value),
             static::$name,
             'One of: "' . implode('", "', static::getValues()) . '"',
         );
     }
-
-    /**
-     * Parent method is deprecated, so remove this after it has been removed.
-     *
-     * @codeCoverageIgnore
-     */
-    #[Override]
-    public function getName(): string
-    {
-        return '';
-    }
 }

src/Doctrine/DBAL/Types/PrimaryStringType.php

@@ -0,0 +1,30 @@
+<?php
+declare(strict_types = 1);
+/**
+ * /src/Doctrine/DBAL/Types/PrimaryStringType.php
+ *
+ * @author TLe, Tarmo Leppänen <tarmo.leppanen@pinja.com>
+ */
+
+namespace App\Doctrine\DBAL\Types;
+
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\StringType;
+use Override;
+
+/**
+ * @package App\Doctrine\DBAL\Types
+ * @author TLe, Tarmo Leppänen <tarmo.leppanen@pinja.com>
+ */
+class PrimaryStringType extends StringType
+{
+    protected static string $name = Types::PRIMARY_STRING;
+
+    #[Override]
+    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
+    {
+        $column['length'] = 255;
+
+        return $platform->getStringTypeDeclarationSQL($column);
+    }
+}

src/Doctrine/DBAL/Types/Types.php

@@ -17,4 +17,5 @@ class Types
     final public const string ENUM_LANGUAGE = 'EnumLanguage';
     final public const string ENUM_LOCALE = 'EnumLocale';
     final public const string ENUM_LOG_LOGIN = 'EnumLogLogin';
+    final public const string PRIMARY_STRING = 'PrimaryString';
 }

src/Doctrine/DBAL/Types/UTCDateTimeType.php

@@ -9,12 +9,12 @@
 namespace App\Doctrine\DBAL\Types;
 
 use DateTime;
-use DateTimeInterface;
 use DateTimeZone;
 use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\ConversionException;
 use Doctrine\DBAL\Types\DateTimeType;
+use Doctrine\DBAL\Types\Exception\InvalidFormat;
 use Override;
 
 /**
@@ -45,15 +45,15 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): stri
     /**
      * @param T $value
      *
-     * @return (T is null ? null : DateTimeInterface)
+     * @return (T is null ? null : DateTime)
      *
      * @template T
      *
      * @throws ConversionException
      * @throws Exception
      */
     #[Override]
-    public function convertToPHPValue($value, AbstractPlatform $platform): DateTimeInterface|null
+    public function convertToPHPValue($value, AbstractPlatform $platform): ?DateTime
     {
         if ($value instanceof DateTime) {
             $value->setTimezone($this->getUtcDateTimeZone());
@@ -90,7 +90,7 @@ private function checkConvertedValue(string $value, AbstractPlatform $platform,
             return $converted;
         }
 
-        throw ConversionException::conversionFailedFormat(
+        throw InvalidFormat::new(
             $value,
             self::lookupName($this),
             $platform->getDateTimeFormatString()

src/Entity/ApiKey.php

@@ -117,8 +117,8 @@ class ApiKey implements EntityInterface, UserGroupAwareInterface
      * @var Collection<int, LogRequest>|ArrayCollection<int, LogRequest>
      */
     #[ORM\OneToMany(
-        mappedBy: 'apiKey',
         targetEntity: LogRequest::class,
+        mappedBy: 'apiKey',
     )]
     #[Groups([
         'ApiKey.logsRequest',

src/Entity/DateDimension.php

@@ -34,10 +34,10 @@
     name: 'date_dimension',
 )]
 #[ORM\Index(
+    name: 'date',
     columns: [
         'date',
     ],
-    name: 'date',
 )]
 #[ORM\ChangeTrackingPolicy('DEFERRED_EXPLICIT')]
 class DateDimension implements EntityInterface

src/Entity/LogLogin.php

@@ -36,16 +36,16 @@
     name: 'log_login',
 )]
 #[ORM\Index(
+    name: 'user_id',
     columns: [
         'user_id',
     ],
-    name: 'user_id',
 )]
 #[ORM\Index(
+    name: 'date',
     columns: [
         'date',
     ],
-    name: 'date',
 )]
 #[ORM\HasLifecycleCallbacks]
 #[ORM\ChangeTrackingPolicy('DEFERRED_EXPLICIT')]

src/Entity/LogLoginFailure.php

@@ -31,10 +31,10 @@
     name: 'log_login_failure',
 )]
 #[ORM\Index(
+    name: 'user_id',
     columns: [
         'user_id',
     ],
-    name: 'user_id',
 )]
 #[ORM\ChangeTrackingPolicy('DEFERRED_EXPLICIT')]
 class LogLoginFailure implements EntityInterface