Merge branch '3.3.x' into 3.4.x

doctrine · Jul 2, 2022 · dcc101f · dcc101f
2 parents 541e9dd + 82fa2f1
commit dcc101f
Show file tree

Hide file tree

Showing 18 changed files with 358 additions and 121 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -41,6 +41,7 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
+          - "8.2"
         dependencies:
           - "highest"
         include:
@@ -67,6 +68,7 @@ jobs:
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
         with:
+          composer-options: "--ignore-platform-req=php+"
           dependency-versions: "${{ matrix.dependencies }}"
 
       - name: "Print SQLite version"
@@ -92,6 +94,7 @@ jobs:
         php-version:
           - "7.4"
           - "8.1"
+          - "8.2"
         oracle-version:
           - "21"
         include:
@@ -127,6 +130,8 @@ jobs:
 
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
+        with:
+          composer-options: "--ignore-platform-req=php+"
 
       - name: "Run PHPUnit"
         run: "vendor/bin/phpunit -c ci/github/phpunit/oci8.xml --coverage-clover=coverage.xml"
@@ -147,6 +152,7 @@ jobs:
         php-version:
           - "7.4"
           - "8.1"
+          - "8.2"
         oracle-version:
           - "21"
         include:
@@ -182,6 +188,8 @@ jobs:
 
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
+        with:
+          composer-options: "--ignore-platform-req=php+"
 
       - name: "Run PHPUnit"
         run: "vendor/bin/phpunit -c ci/github/phpunit/pdo_oci.xml --coverage-clover=coverage.xml"
@@ -208,6 +216,8 @@ jobs:
         include:
           - php-version: "8.1"
             postgres-version: "14"
+          - php-version: "8.2"
+            postgres-version: "14"
 
     services:
       postgres:
@@ -236,6 +246,8 @@ jobs:
 
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
+        with:
+          composer-options: "--ignore-platform-req=php+"
 
       - name: "Run PHPUnit"
         run: "vendor/bin/phpunit -c ci/github/phpunit/pdo_pgsql.xml --coverage-clover=coverage.xml"
@@ -276,6 +288,12 @@ jobs:
           - php-version: "8.1"
             mariadb-version: "10.7"
             extension: "pdo_mysql"
+          - php-version: "8.2"
+            mariadb-version: "10.7"
+            extension: "mysqli"
+          - php-version: "8.2"
+            mariadb-version: "10.7"
+            extension: "pdo_mysql"
 
     services:
       mariadb:
@@ -306,6 +324,8 @@ jobs:
 
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
+        with:
+          composer-options: "--ignore-platform-req=php+"
 
       - name: "Run PHPUnit"
         run: "vendor/bin/phpunit -c ci/github/phpunit/${{ matrix.extension }}.xml --coverage-clover=coverage.xml"
@@ -354,6 +374,12 @@ jobs:
             extension: "pdo_mysql"
             custom-entrypoint: >-
               --entrypoint sh mysql:8 -c "exec docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password"
+          - php-version: "8.2"
+            mysql-version: "8.0"
+            extension: "mysqli"
+          - php-version: "8.2"
+            mysql-version: "8.0"
+            extension: "pdo_mysql"
 
     services:
       mysql:
@@ -384,6 +410,8 @@ jobs:
 
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
+        with:
+          composer-options: "--ignore-platform-req=php+"
 
       - name: "Copy TLS-related files"
         run: 'docker cp "${{ job.services.mysql.id }}:/var/lib/mysql/ca.pem" . && docker cp "${{ job.services.mysql.id }}:/var/lib/mysql/client-cert.pem" . && docker cp "${{ job.services.mysql.id }}:/var/lib/mysql/client-key.pem" .'
@@ -408,6 +436,7 @@ jobs:
         php-version:
           - "7.4"
           - "8.1"
+          - "8.2"
         extension:
           - "sqlsrv"
           - "pdo_sqlsrv"
@@ -452,6 +481,8 @@ jobs:
 
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
+        with:
+          composer-options: "--ignore-platform-req=php+"
 
       - name: "Run PHPUnit"
         run: "vendor/bin/phpunit -c ci/github/phpunit/${{ matrix.extension }}.xml --coverage-clover=coverage.xml"

diff --git a/composer.json b/composer.json
@@ -42,14 +42,14 @@
     "require-dev": {
         "doctrine/coding-standard": "9.0.0",
         "jetbrains/phpstorm-stubs": "2022.1",
-        "phpstan/phpstan": "1.7.13",
+        "phpstan/phpstan": "1.7.15",
         "phpstan/phpstan-strict-rules": "^1.2",
-        "phpunit/phpunit": "9.5.20",
-        "psalm/plugin-phpunit": "0.16.1",
-        "squizlabs/php_codesniffer": "3.7.0",
+        "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.23.0"
+        "vimeo/psalm": "4.24.0"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -384,10 +384,6 @@
                     This issue is fixed in 4.0
                 -->
                 <file name="src/Schema/Index.php"/>
-                <!--
-                    See https://github.com/vimeo/psalm/issues/5325
-                -->
-                <file name="tests/Driver/OCI8/ExecutionModeTest.php"/>
                 <!-- See https://github.com/vimeo/psalm/issues/5472 -->
                 <file name="src/Portability/Converter.php"/>
                 <!-- See https://github.com/psalm/psalm-plugin-phpunit/issues/107 -->
@@ -538,13 +534,6 @@
                 <file name="src/Query/QueryBuilder.php"/>
             </errorLevel>
         </ReferenceConstraintViolation>
-        <!-- Workaround for https://github.com/vimeo/psalm/issues/7026 -->
-        <ReservedWord>
-            <errorLevel type="suppress">
-                <directory name="src"/>
-                <directory name="tests"/>
-            </errorLevel>
-        </ReservedWord>
         <TooManyArguments>
             <errorLevel type="suppress">
                 <!--

diff --git a/src/Driver/IBMDB2/Exception/CannotWriteToTemporaryFile.php b/src/Driver/IBMDB2/Exception/CannotWriteToTemporaryFile.php
diff --git a/src/Driver/IBMDB2/Statement.php b/src/Driver/IBMDB2/Statement.php
@@ -5,7 +5,6 @@
 use Doctrine\DBAL\Driver\Exception;
 use Doctrine\DBAL\Driver\IBMDB2\Exception\CannotCopyStreamToStream;
 use Doctrine\DBAL\Driver\IBMDB2\Exception\CannotCreateTemporaryFile;
-use Doctrine\DBAL\Driver\IBMDB2\Exception\CannotWriteToTemporaryFile;
 use Doctrine\DBAL\Driver\IBMDB2\Exception\StatementError;
 use Doctrine\DBAL\Driver\Result as ResultInterface;
 use Doctrine\DBAL\Driver\Statement as StatementInterface;
@@ -16,10 +15,8 @@
 use function db2_execute;
 use function error_get_last;
 use function fclose;
-use function fwrite;
 use function is_int;
 use function is_resource;
-use function ksort;
 use function stream_copy_to_stream;
 use function stream_get_meta_data;
 use function tmpfile;
@@ -36,13 +33,13 @@ final class Statement implements StatementInterface
     private $stmt;
 
     /** @var mixed[] */
-    private array $bindParam = [];
+    private array $parameters = [];
 
     /**
      * Map of LOB parameter positions to the tuples containing reference to the variable bound to the driver statement
      * and the temporary file handle bound to the underlying statement
      *
-     * @var mixed[][]
+     * @var array<int,string|resource|null>
      */
     private array $lobs = [];
 
@@ -79,17 +76,7 @@ public function bindParam($param, &$variable, $type = ParameterType::STRING, $le
                 break;
 
             case ParameterType::LARGE_OBJECT:
-                if (isset($this->lobs[$param])) {
-                    [, $handle] = $this->lobs[$param];
-                    fclose($handle);
-                }
-
-                $handle = $this->createTemporaryFile();
-                $path   = stream_get_meta_data($handle)['uri'];
-
-                $this->bind($param, $path, DB2_PARAM_FILE, DB2_BINARY);
-
-                $this->lobs[$param] = [&$variable, $handle];
+                $this->lobs[$param] = &$variable;
                 break;
 
             default:
@@ -108,9 +95,9 @@ public function bindParam($param, &$variable, $type = ParameterType::STRING, $le
      */
     private function bind($position, &$variable, int $parameterType, int $dataType): void
     {
-        $this->bindParam[$position] =& $variable;
+        $this->parameters[$position] =& $variable;
 
-        if (! db2_bind_param($this->stmt, $position, 'variable', $parameterType, $dataType)) {
+        if (! db2_bind_param($this->stmt, $position, '', $parameterType, $dataType)) {
             throw StatementError::new($this->stmt);
         }
     }
@@ -120,29 +107,11 @@ private function bind($position, &$variable, int $parameterType, int $dataType):
      */
     public function execute($params = null): ResultInterface
     {
-        if ($params === null) {
-            ksort($this->bindParam);
+        $handles = $this->bindLobs();
 
-            $params = [];
+        $result = @db2_execute($this->stmt, $params ?? $this->parameters);
 
-            foreach ($this->bindParam as $value) {
-                $params[] = $value;
-            }
-        }
-
-        foreach ($this->lobs as [$source, $target]) {
-            if (is_resource($source)) {
-                $this->copyStreamToStream($source, $target);
-
-                continue;
-            }
-
-            $this->writeStringToStream($source, $target);
-        }
-
-        $result = @db2_execute($this->stmt, $params);
-
-        foreach ($this->lobs as [, $handle]) {
+        foreach ($handles as $handle) {
             fclose($handle);
         }
 
@@ -155,6 +124,31 @@ public function execute($params = null): ResultInterface
         return new Result($this->stmt);
     }
 
+    /**
+     * @return list<resource>
+     *
+     * @throws Exception
+     */
+    private function bindLobs(): array
+    {
+        $handles = [];
+
+        foreach ($this->lobs as $param => $value) {
+            if (is_resource($value)) {
+                $handle = $handles[] = $this->createTemporaryFile();
+                $path   = stream_get_meta_data($handle)['uri'];
+
+                $this->copyStreamToStream($value, $handle);
+
+                $this->bind($param, $path, DB2_PARAM_FILE, DB2_BINARY);
+            } else {
+                $this->bind($param, $value, DB2_PARAM_IN, DB2_CHAR);
+            }
+        }
+
+        return $handles;
+    }
+
     /**
      * @return resource
      *
@@ -183,16 +177,4 @@ private function copyStreamToStream($source, $target): void
             throw CannotCopyStreamToStream::new(error_get_last());
         }
     }
-
-    /**
-     * @param resource $target
-     *
-     * @throws Exception
-     */
-    private function writeStringToStream(string $string, $target): void
-    {
-        if (@fwrite($target, $string) === false) {
-            throw CannotWriteToTemporaryFile::new(error_get_last());
-        }
-    }
 }
diff --git a/src/Driver/OCI8/Statement.php b/src/Driver/OCI8/Statement.php
@@ -71,10 +71,14 @@ public function bindParam($param, &$variable, $type = ParameterType::STRING, $le
         }
 
         if ($type === ParameterType::LARGE_OBJECT) {
-            $lob = oci_new_descriptor($this->connection, OCI_D_LOB);
-            $lob->writeTemporary($variable, OCI_TEMP_BLOB);
+            if ($variable !== null) {
+                $lob = oci_new_descriptor($this->connection, OCI_D_LOB);
+                $lob->writeTemporary($variable, OCI_TEMP_BLOB);
 
-            $variable =& $lob;
+                $variable =& $lob;
+            } else {
+                $type = ParameterType::STRING;
+            }
         }
 
         return oci_bind_by_name(

diff --git a/src/Platforms/MySQL/CollationMetadataProvider.php b/src/Platforms/MySQL/CollationMetadataProvider.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Platforms\MySQL;
+
+/**
+ * @internal
+ */
+interface CollationMetadataProvider
+{
+    public function getCollationCharset(string $collation): ?string;
+}