Merge remote-tracking branch 'origin/1.3.x' into 1.4.x

Author: ondrejmirtes

extension.neon

@@ -19,7 +19,12 @@ parameters:
 			- Doctrine\ORM\Tools\Pagination\Paginator
 	stubFiles:
 		- stubs/Criteria.stub
+		- stubs/DBAL/Cache/CacheException.stub
+		- stubs/DBAL/Cache/QueryCacheProfile.stub
 		- stubs/DBAL/Exception/UniqueConstraintViolationException.stub
+		- stubs/DBAL/Types/Type.stub
+		- stubs/DBAL/Exception.stub
+		- stubs/DBAL/Result.stub
 		- stubs/DocumentManager.stub
 		- stubs/DocumentRepository.stub
 		- stubs/EntityManager.stub

src/Stubs/Doctrine/StubFilesExtensionLoader.php

@@ -35,6 +35,7 @@ public function getFiles(): array
 		}
 
 		$files = [
+			$path . '/DBAL/Connection.stub',
 			$path . '/ORM/QueryBuilder.stub',
 			$path . '/EntityRepository.stub',
 		];

stubs/DBAL/Cache/CacheException.stub

@@ -0,0 +1,10 @@
+<?php
+
+namespace Doctrine\DBAL\Cache;
+
+use Doctrine\DBAL\Exception;
+
+class CacheException extends Exception
+{
+
+}

stubs/DBAL/Cache/QueryCacheProfile.stub

@@ -0,0 +1,8 @@
+<?php
+
+namespace Doctrine\DBAL\Cache;
+
+class QueryCacheProfile
+{
+
+}

stubs/DBAL/Connection.stub

@@ -0,0 +1,8 @@
+<?php
+
+namespace Doctrine\DBAL;
+
+class Connection
+{
+
+}

stubs/DBAL/Exception.stub

@@ -0,0 +1,8 @@
+<?php
+
+namespace Doctrine\DBAL;
+
+class Exception extends \Exception
+{
+
+}

stubs/DBAL/Exception/UniqueConstraintViolationException.stub

@@ -2,7 +2,9 @@
 
 namespace Doctrine\DBAL\Exception;
 
-class UniqueConstraintViolationException extends \Exception
+use Doctrine\DBAL\Exception;
+
+class UniqueConstraintViolationException extends Exception
 {
 
 }

stubs/DBAL/Result.stub

@@ -0,0 +1,8 @@
+<?php
+
+namespace Doctrine\DBAL;
+
+class Result
+{
+
+}

stubs/DBAL/Types/Type.stub

@@ -0,0 +1,7 @@
+<?php
+
+namespace Doctrine\DBAL\Types;
+
+abstract class Type
+{
+}

stubs/bleedingEdge/DBAL/Connection.stub

@@ -0,0 +1,64 @@
+<?php
+
+namespace Doctrine\DBAL;
+
+use Doctrine\DBAL\Cache\CacheException;
+use Doctrine\DBAL\Cache\QueryCacheProfile;
+use Doctrine\DBAL\Types\Type;
+
+class Connection
+{
+    /**
+     * Executes an SQL statement with the given parameters and returns the number of affected rows.
+     *
+     * Could be used for:
+     *  - DML statements: INSERT, UPDATE, DELETE, etc.
+     *  - DDL statements: CREATE, DROP, ALTER, etc.
+     *  - DCL statements: GRANT, REVOKE, etc.
+     *  - Session control statements: ALTER SESSION, SET, DECLARE, etc.
+     *  - Other statements that don't yield a row set.
+     *
+     * This method supports PDO binding types as well as DBAL mapping types.
+     *
+     * @param literal-string                                                       $sql    SQL statement
+     * @param list<mixed>|array<string, mixed>                                     $params Statement parameters
+     * @param array<int, int|string|Type|null>|array<string, int|string|Type|null> $types  Parameter types
+     *
+     * @return int|string The number of affected rows.
+     *
+     * @throws Exception
+     */
+    public function executeStatement($sql, array $params = [], array $types = []);
+
+    /**
+     * Executes an, optionally parameterized, SQL query.
+     *
+     * If the query is parametrized, a prepared statement is used.
+     * If an SQLLogger is configured, the execution is logged.
+     *
+     * @param literal-string                                                       $sql    SQL query
+     * @param list<mixed>|array<string, mixed>                                     $params Query parameters
+     * @param array<int, int|string|Type|null>|array<string, int|string|Type|null> $types  Parameter types
+     *
+     * @throws Exception
+     */
+    public function executeQuery(
+        string $sql,
+        array $params = [],
+        $types = [],
+        ?QueryCacheProfile $qcp = null
+    ): Result;
+
+    /**
+     * Executes a caching query.
+     *
+     * @param literal-string                                                       $sql    SQL query
+     * @param list<mixed>|array<string, mixed>                                     $params Query parameters
+     * @param array<int, int|string|Type|null>|array<string, int|string|Type|null> $types  Parameter types
+     *
+     * @throws CacheException
+     * @throws Exception
+     */
+    public function executeCacheQuery($sql, $params, $types, QueryCacheProfile $qcp): Result;
+
+}