Merge pull request #3113 from Majkl578/revert-complex-type-spec

Revert complex type specification in Connection
doctrine · May 2, 2018 · 85bb696 · 85bb696
2 parents 8392c26 + 73b6444
commit 85bb696
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/lib/Doctrine/DBAL/Connection.php b/lib/Doctrine/DBAL/Connection.php
@@ -882,7 +882,7 @@ public function prepare(string $sql) : DriverStatement
      *
      * @param string                 $query  The SQL query to execute.
      * @param mixed[]                $params The parameters to bind to the query, if any.
-     * @param (int|string|Type)[]    $types  The types the previous parameters are in.
+     * @param int[]|string[]|Type[]  $types  The types the previous parameters are in.
      * @param QueryCacheProfile|null $qcp    The query cache profile, optional.
      *
      * @throws DBALException
@@ -926,10 +926,10 @@ public function executeQuery(string $query, array $params = [], $types = [], ?Qu
     /**
      * Executes a caching query.
      *
-     * @param string              $query  The SQL query to execute.
-     * @param mixed[]             $params The parameters to bind to the query, if any.
-     * @param (int|string)|Type[] $types  The types the previous parameters are in.
-     * @param QueryCacheProfile   $qcp    The query cache profile.
+     * @param string                $query  The SQL query to execute.
+     * @param mixed[]               $params The parameters to bind to the query, if any.
+     * @param int[]|string[]|Type[] $types  The types the previous parameters are in.
+     * @param QueryCacheProfile     $qcp    The query cache profile.
      *
      * @throws DBALException
      */
@@ -1016,9 +1016,9 @@ public function query(string $sql) : ResultStatement
      *
      * This method supports PDO binding types as well as DBAL mapping types.
      *
-     * @param string              $query  The SQL query.
-     * @param mixed[]             $params The query parameters.
-     * @param (int|string|Type)[] $types  The parameter types.
+     * @param string                $query  The SQL query.
+     * @param mixed[]               $params The query parameters.
+     * @param int[]|string[]|Type[] $types  The parameter types.
      *
      * @throws DBALException
      */
@@ -1460,9 +1460,9 @@ public function convertToPHPValue($value, $type)
      * Binds a set of parameters, some or all of which are typed with a PDO binding type
      * or DBAL mapping type, to a given statement.
      *
-     * @param DriverStatement     $stmt   The statement to bind the values to.
-     * @param mixed[]             $params The map/list of named/positional parameters.
-     * @param (int|string|Type)[] $types  The parameter types.
+     * @param DriverStatement       $stmt   The statement to bind the values to.
+     * @param mixed[]               $params The map/list of named/positional parameters.
+     * @param int[]|string[]|Type[] $types  The parameter types.
      */
     private function _bindTypedValues(DriverStatement $stmt, array $params, array $types) : void
     {