chore(deps): Bump doctrine/dbal to supported 3.6.2

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Jul 5, 2023 · 8ceb1ab · 8ceb1ab
1 parent ee59165
commit 8ceb1ab
Show file tree

Hide file tree

Showing 277 changed files with 10,203 additions and 3,613 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
 		"cweagans/composer-patches": "^1.7",
 		"deepdiver/zipstreamer": "2.0.0",
 		"deepdiver1975/tarstreamer": "v2.0.0",
-		"doctrine/dbal": "3.3.8",
+		"doctrine/dbal": "^3.6.4",
 		"egulias/email-validator": "^3.2.5",
 		"fusonic/opengraph": "^2.2",
 		"giggsey/libphonenumber-for-php-lite": "^8.13.12",

diff --git a/composer.lock b/composer.lock
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
diff --git a/composer/installed.json b/composer/installed.json
@@ -578,44 +578,45 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.3.8",
-            "version_normalized": "3.3.8.0",
+            "version": "3.6.4",
+            "version_normalized": "3.6.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "f873a820227bc352d023791775a01f078a30dfe1"
+                "reference": "19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/f873a820227bc352d023791775a01f078a30dfe1",
-                "reference": "f873a820227bc352d023791775a01f078a30dfe1",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f",
+                "reference": "19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f",
                 "shasum": ""
             },
             "require": {
                 "composer-runtime-api": "^2",
                 "doctrine/cache": "^1.11|^2.0",
                 "doctrine/deprecations": "^0.5.3|^1",
-                "doctrine/event-manager": "^1.0",
-                "php": "^7.3 || ^8.0",
+                "doctrine/event-manager": "^1|^2",
+                "php": "^7.4 || ^8.0",
                 "psr/cache": "^1|^2|^3",
                 "psr/log": "^1|^2|^3"
             },
             "require-dev": {
-                "doctrine/coding-standard": "9.0.0",
-                "jetbrains/phpstorm-stubs": "2022.1",
-                "phpstan/phpstan": "1.8.2",
-                "phpstan/phpstan-strict-rules": "^1.3",
-                "phpunit/phpunit": "9.5.21",
-                "psalm/plugin-phpunit": "0.17.0",
-                "squizlabs/php_codesniffer": "3.7.1",
-                "symfony/cache": "^5.2|^6.0",
-                "symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0",
-                "vimeo/psalm": "4.24.0"
+                "doctrine/coding-standard": "12.0.0",
+                "fig/log-test": "^1",
+                "jetbrains/phpstorm-stubs": "2022.3",
+                "phpstan/phpstan": "1.10.14",
+                "phpstan/phpstan-strict-rules": "^1.5",
+                "phpunit/phpunit": "9.6.7",
+                "psalm/plugin-phpunit": "0.18.4",
+                "squizlabs/php_codesniffer": "3.7.2",
+                "symfony/cache": "^5.4|^6.0",
+                "symfony/console": "^4.4|^5.4|^6.0",
+                "vimeo/psalm": "4.30.0"
             },
             "suggest": {
                 "symfony/console": "For helpful console commands such as SQL execution and import of files."
             },
-            "time": "2022-08-05T15:35:35+00:00",
+            "time": "2023-06-15T07:40:12+00:00",
             "bin": [
                 "bin/doctrine-dbal"
             ],
@@ -672,7 +673,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.3.8"
+                "source": "https://github.com/doctrine/dbal/tree/3.6.4"
             },
             "funding": [
                 {

diff --git a/composer/installed.php b/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'nextcloud/3rdparty',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '268aaeff738002179c0f5e9d9542ec362d987a5f',
+        'reference' => 'ee5916541cb4487eb2e00996044b96d2361555cc',
         'type' => 'library',
         'install_path' => __DIR__ . '/../',
         'aliases' => array(),
@@ -92,9 +92,9 @@
             'dev_requirement' => false,
         ),
         'doctrine/dbal' => array(
-            'pretty_version' => '3.3.8',
-            'version' => '3.3.8.0',
-            'reference' => 'f873a820227bc352d023791775a01f078a30dfe1',
+            'pretty_version' => '3.6.4',
+            'version' => '3.6.4.0',
+            'reference' => '19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../doctrine/dbal',
             'aliases' => array(),
@@ -310,7 +310,7 @@
         'nextcloud/3rdparty' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '268aaeff738002179c0f5e9d9542ec362d987a5f',
+            'reference' => 'ee5916541cb4487eb2e00996044b96d2361555cc',
             'type' => 'library',
             'install_path' => __DIR__ . '/../',
             'aliases' => array(),

diff --git a/doctrine/dbal/src/ArrayParameterType.php b/doctrine/dbal/src/ArrayParameterType.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Doctrine\DBAL;
+
+final class ArrayParameterType
+{
+    /**
+     * Represents an array of ints to be expanded by Doctrine SQL parsing.
+     */
+    public const INTEGER = ParameterType::INTEGER + Connection::ARRAY_PARAM_OFFSET;
+
+    /**
+     * Represents an array of strings to be expanded by Doctrine SQL parsing.
+     */
+    public const STRING = ParameterType::STRING + Connection::ARRAY_PARAM_OFFSET;
+
+    /**
+     * Represents an array of ascii strings to be expanded by Doctrine SQL parsing.
+     */
+    public const ASCII = ParameterType::ASCII + Connection::ARRAY_PARAM_OFFSET;
+
+    /**
+     * @internal
+     *
+     * @psalm-param self::INTEGER|self::STRING|self::ASCII $type
+     *
+     * @psalm-return ParameterType::INTEGER|ParameterType::STRING|ParameterType::ASCII
+     */
+    public static function toElementParameterType(int $type): int
+    {
+        return $type - Connection::ARRAY_PARAM_OFFSET;
+    }
+
+    private function __construct()
+    {
+    }
+}
diff --git a/doctrine/dbal/src/ArrayParameters/Exception.php b/doctrine/dbal/src/ArrayParameters/Exception.php
@@ -4,9 +4,7 @@
 
 use Throwable;
 
-/**
- * @internal
- */
+/** @internal */
 interface Exception extends Throwable
 {
 }
diff --git a/doctrine/dbal/src/ArrayParameters/Exception/MissingNamedParameter.php b/doctrine/dbal/src/ArrayParameters/Exception/MissingNamedParameter.php
@@ -7,15 +7,13 @@
 
 use function sprintf;
 
-/**
- * @psalm-immutable
- */
+/** @psalm-immutable */
 class MissingNamedParameter extends LogicException implements Exception
 {
     public static function new(string $name): self
     {
         return new self(
-            sprintf('Named parameter "%s" does not have a bound value.', $name)
+            sprintf('Named parameter "%s" does not have a bound value.', $name),
         );
     }
 }
diff --git a/doctrine/dbal/src/ArrayParameters/Exception/MissingPositionalParameter.php b/doctrine/dbal/src/ArrayParameters/Exception/MissingPositionalParameter.php
@@ -17,7 +17,7 @@ class MissingPositionalParameter extends LogicException implements Exception
     public static function new(int $index): self
     {
         return new self(
-            sprintf('Positional parameter at index %d does not have a bound value.', $index)
+            sprintf('Positional parameter at index %d does not have a bound value.', $index),
         );
     }
 }
diff --git a/doctrine/dbal/src/Cache/ArrayResult.php b/doctrine/dbal/src/Cache/ArrayResult.php
@@ -9,23 +9,16 @@
 use function count;
 use function reset;
 
-/**
- * @internal The class is internal to the caching layer implementation.
- */
+/** @internal The class is internal to the caching layer implementation. */
 final class ArrayResult implements Result
 {
     /** @var list<array<string, mixed>> */
-    private $data;
+    private array $data;
 
-    /** @var int */
-    private $columnCount = 0;
+    private int $columnCount = 0;
+    private int $num         = 0;
 
-    /** @var int */
-    private $num = 0;
-
-    /**
-     * @param list<array<string, mixed>> $data
-     */
+    /** @param list<array<string, mixed>> $data */
     public function __construct(array $data)
     {
         $this->data = $data;
@@ -37,7 +30,7 @@ public function __construct(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function fetchNumeric()
     {
@@ -51,15 +44,15 @@ public function fetchNumeric()
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function fetchAssociative()
     {
         return $this->fetch();
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function fetchOne()
     {
@@ -73,23 +66,23 @@ public function fetchOne()
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function fetchAllNumeric(): array
     {
         return FetchUtils::fetchAllNumeric($this);
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function fetchAllAssociative(): array
     {
         return FetchUtils::fetchAllAssociative($this);
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function fetchFirstColumn(): array
     {
@@ -111,9 +104,7 @@ public function free(): void
         $this->data = [];
     }
 
-    /**
-     * @return array<string, mixed>|false
-     */
+    /** @return array<string, mixed>|false */
     private function fetch()
     {
         if (! isset($this->data[$this->num])) {

diff --git a/doctrine/dbal/src/Cache/CacheException.php b/doctrine/dbal/src/Cache/CacheException.php
@@ -4,22 +4,16 @@
 
 use Doctrine\DBAL\Exception;
 
-/**
- * @psalm-immutable
- */
+/** @psalm-immutable */
 class CacheException extends Exception
 {
-    /**
-     * @return CacheException
-     */
+    /** @return CacheException */
     public static function noCacheKey()
     {
         return new self('No cache key was set.');
     }
 
-    /**
-     * @return CacheException
-     */
+    /** @return CacheException */
     public static function noResultDriverConfigured()
     {
         return new self('Trying to cache a query but no result driver is configured.');