Merge pull request #22 from assoconnect/fix_naming

Fix naming

Author: sylfabre

src/DependencyInjection/PHPDateExtension.php

@@ -17,10 +17,10 @@ public function prepend(ContainerBuilder $container): void
         $container->prependExtensionConfig('doctrine', [
             'dbal' => [
                 'types' => [
-                    'date_absolute' => AbsoluteDateType::class,
+                    'absolute_date' => AbsoluteDateType::class,
                 ],
                 'mapping_types' => [
-                    'date_absolute' => 'string',
+                    'absolute_date' => 'string',
                 ],
             ]
         ]);

src/Doctrine/DBAL/Types/AbsoluteDateType.php

@@ -7,20 +7,22 @@
 use AssoConnect\PHPDate\AbsoluteDate;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\ConversionException;
-use Doctrine\DBAL\Types\DateType;
+use Doctrine\DBAL\Types\Type;
 
-class AbsoluteDateType extends DateType
+class AbsoluteDateType extends Type
 {
-    public const TYPE = 'date_absolute';
+    public const NAME = 'absolute_date';
+
+    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
+    {
+        return $platform->getDateTypeDeclarationSQL($column);
+    }
 
     public function getName(): string
     {
-        return self::TYPE;
+        return self::NAME;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
     {
         if ($value === null) {
@@ -34,9 +36,6 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
         throw ConversionException::conversionFailedInvalidType($value, $this->getName(), ['null', AbsoluteDate::class]);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function convertToPHPValue($value, AbstractPlatform $platform): ?AbsoluteDate
     {
         if ($value === null || $value instanceof AbsoluteDate) {
@@ -55,9 +54,6 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?Absolute
         }
     }
 
-    /**
-     * @inheritdoc
-     */
     public function requiresSQLCommentHint(AbstractPlatform $platform): bool
     {
         return true;

src/Doctrine/DBAL/Types/DateTimeZoneType.php

@@ -10,9 +10,8 @@
 
 class DateTimeZoneType extends Type
 {
-    /**
-     * @inheritdoc
-     */
+    public const NAME = 'datetimezone';
+
     public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform): string
     {
         $fieldDeclaration['length'] = 30;
@@ -21,20 +20,14 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla
 
     public function getName(): string
     {
-        return 'datetimezone';
+        return self::NAME;
     }
 
-    /**
-     * @inheritdoc
-     */
     public function requiresSQLCommentHint(AbstractPlatform $platform): bool
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
     {
         if ($value === null) {
@@ -48,9 +41,6 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
         throw ConversionException::conversionFailedInvalidType($value, $this->getName(), ['null', 'DateTimeZone']);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function convertToPHPValue($value, AbstractPlatform $platform): ?\DateTimeZone
     {
         if ($value === null || $value instanceof \DateTimeZone) {

src/Twig/Extension/AbsoluteDateExtension.php

@@ -22,7 +22,7 @@ public function __construct(TranslatorInterface $translator)
     public function getFilters(): array
     {
         return [
-            new TwigFilter('absolutDate', [$this, 'formatAbsoluteDate']),
+            new TwigFilter('absoluteDate', [$this, 'formatAbsoluteDate']),
         ];
     }
 

tests/Twig/Extension/AbsoluteDateExtensionTest.php

@@ -32,6 +32,6 @@ public function testFilterName(): void
         $extension = new AbsoluteDateExtension($this->createMock(Translator::class));
         $filters = $extension->getFilters();
 
-        self::assertSame('absolutDate', $filters[0]->getName());
+        self::assertSame('absoluteDate', $filters[0]->getName());
     }
 }