Improve array key types in Doctrine\DBAL\Types namespace.

doctrine · May 30, 2019 · 0abe4f2 · 0abe4f2
1 parent 4ebb488
commit 0abe4f2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/lib/Doctrine/DBAL/Types/Type.php b/lib/Doctrine/DBAL/Types/Type.php
@@ -160,8 +160,8 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
     /**
      * Gets the SQL declaration snippet for a field of this type.
      *
-     * @param mixed[]          $fieldDeclaration The field declaration.
-     * @param AbstractPlatform $platform         The currently used database platform.
+     * @param array<string, mixed> $fieldDeclaration The field declaration.
+     * @param AbstractPlatform     $platform         The currently used database platform.
      */
     abstract public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) : string;
 
@@ -258,7 +258,7 @@ public function getBindingType() : int
      * Gets the types array map which holds all registered types and the corresponding
      * type class
      *
-     * @return string[]
+     * @return array<string, string>
      */
     public static function getTypesMap() : array
     {
@@ -302,7 +302,7 @@ public function convertToPHPValueSQL(string $sqlExpr, AbstractPlatform $platform
     /**
      * Gets an array of database types that map to this Doctrine type.
      *
-     * @return string[]
+     * @return array<int, string>
      */
     public function getMappedDatabaseTypes(AbstractPlatform $platform) : array
     {

diff --git a/lib/Doctrine/DBAL/Types/TypeRegistry.php b/lib/Doctrine/DBAL/Types/TypeRegistry.php
@@ -21,7 +21,11 @@
  */
 final class TypeRegistry
 {
-    /** @var array<string, Type> Map of type names and their corresponding flyweight objects. */
+    /**
+     * Map of type names and their corresponding flyweight objects.
+     *
+     * @var array<string, Type>
+     */
     private $instances = [];
 
     /**

diff --git a/tests/Doctrine/Tests/Types/MySqlPointType.php b/tests/Doctrine/Tests/Types/MySqlPointType.php
@@ -13,23 +13,23 @@ class MySqlPointType extends Type
     /**
      * {@inheritDoc}
      */
-    public function getName()
+    public function getName() : string
     {
         return 'point';
     }
 
     /**
      * {@inheritDoc}
      */
-    public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
+    public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) : string
     {
         return strtoupper($this->getName());
     }
 
     /**
      * {@inheritDoc}
      */
-    public function getMappedDatabaseTypes(AbstractPlatform $platform)
+    public function getMappedDatabaseTypes(AbstractPlatform $platform) : array
     {
         return ['point'];
     }