Php8

composer.json

@@ -22,7 +22,7 @@
     "drupal/core" : "^9.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7",
+    "phpunit/phpunit": "^8.5.10",
     "phpstan/phpstan": "*",
     "php-coveralls/php-coveralls": "*"
   }

dev/TestSuites/TestSuiteBase.php

@@ -18,13 +18,8 @@ abstract class TestSuiteBase extends TestSuite {
   protected $failingClasses = [
     // Kernel Test Failures.
     '/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php',
-    '/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php',
-    '/core/modules/aggregator/tests/src/Kernel/Migrate/MigrateAggregatorStubTest.php',
     '/core/modules/migrate_drupal/tests/src/Kernel/d7/FieldDiscoveryTest.php',
-    '/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php',
     // Functional Test Failures.
-    '/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php',
-    '/core/modules/datetime/tests/src/Functional/Views/FilterDateTest.php',
     '/core/modules/language/tests/src/Functional/ConfigurableLanguageManagerTest.php',
     '/core/modules/locale/tests/src/Functional/LocaleLocaleLookupTest.php',
     '/core/modules/path/tests/src/Functional/PathAliasTest.php',

dev/travis/drupal9.1.x.sh

@@ -1 +1,2 @@
 bash ../sqlsrv/dev/travis/drupal9.x.sh
+composer require phpunit/phpunit:^8.5.10 --with-all-dependencies

src/Driver/Database/sqlsrv/Connection.php

@@ -7,6 +7,7 @@
 use Drupal\Core\Database\DatabaseException;
 use Drupal\Core\Database\DatabaseNotFoundException;
 use Drupal\Core\Database\StatementInterface;
+use Drupal\Core\Database\StatementWrapper;
 use Drupal\Core\Database\TransactionNoActiveException;
 use Drupal\Core\Database\TransactionOutOfOrderException;
 use Drupal\Core\Database\TransactionNameNonUniqueException;
@@ -16,6 +17,16 @@
  */
 class Connection extends DatabaseConnection {
 
+  /**
+   * {@inheritdoc}
+   */
+  protected $statementClass = NULL;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $statementWrapperClass = StatementWrapper::class;
+
   /**
    * The identifier quote characters for the database type.
    *
@@ -458,7 +469,7 @@ public function pushTransaction($name) {
    * This method is overriden to manage EMULATE_PREPARE
    * behaviour to prevent some compatibility issues with SQL Server.
    *
-   * @param string|\Drupal\Core\Database\Statement $query
+   * @param string|\Drupal\Core\Database\Statement $query|\PDOStatement $query
    *   The query to execute. In most cases this will be a string containing
    *   an SQL query with placeholders. An already-prepared instance of
    *   StatementInterface may also be passed in order to allow calling
@@ -515,6 +526,10 @@ public function query($query, array $args = [], $options = []) {
         $stmt = $query;
         $stmt->execute(NULL, $options);
       }
+      elseif ($query instanceof \PDOStatement) {
+        $stmt = $query;
+        $stmt->execute();
+      }
       else {
         $this->expandArguments($query, $args);
         $query = rtrim($query, ";  \t\n\r\0\x0B");

src/Driver/Database/sqlsrv/Update.php

@@ -37,14 +37,14 @@ public function execute() {
           // We assume that an expression will never happen on a BLOB field,
           // which is a fairly safe assumption to make since in most cases
           // it would be an invalid query anyway.
-          $stmt->bindParam($placeholder, $data['arguments'][$placeholder]);
+          $stmt->getClientStatement()->bindParam($placeholder, $data['arguments'][$placeholder]);
         }
       }
       if ($data['expression'] instanceof SelectInterface) {
         $data['expression']->compile($this->connection, $this);
         $select_query_arguments = $data['expression']->arguments();
         foreach ($select_query_arguments as $placeholder => $argument) {
-          $stmt->bindParam($placeholder, $select_query_arguments[$placeholder]);
+          $stmt->getClientStatement()->bindParam($placeholder, $select_query_arguments[$placeholder]);
         }
       }
       unset($fields[$field]);

src/Driver/Database/sqlsrv/Utils.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\sqlsrv\Driver\Database\sqlsrv;
 
+use Drupal\Core\Database\StatementWrapper;
 use Symfony\Component\Yaml\Parser;
 
 /**
@@ -12,14 +13,14 @@ class Utils {
   /**
    * Bind the arguments to the statement.
    *
-   * @param \PDOStatement $stmt
+   * @param StatementWrapper $stmt
    *   Statement.
    * @param array $values
    *   Argument values.
    */
-  public static function bindArguments(\PDOStatement $stmt, array &$values) {
+  public static function bindArguments(StatementWrapper $stmt, array &$values) {
     foreach ($values as $key => &$value) {
-      $stmt->bindParam($key, $value, \PDO::PARAM_STR);
+      $stmt->getClientStatement()->bindParam($key, $value, \PDO::PARAM_STR);
     }
   }
 
@@ -28,7 +29,7 @@ public static function bindArguments(\PDOStatement $stmt, array &$values) {
    *
    * Takes care of properly managing binary data.
    *
-   * @param \PDOStatement $stmt
+   * @param StatementWrapper $stmt
    *   PDOStatement to bind the values to.
    * @param array $values
    *   Values to bind. It's an array where the keys are column
@@ -45,7 +46,7 @@ public static function bindArguments(\PDOStatement $stmt, array &$values) {
    * @param mixed $blob_suffix
    *   Suffix for the blob key.
    */
-  public static function bindValues(\PDOStatement $stmt, array &$values, array &$blobs, $placeholder_prefix, array $columnInformation, &$max_placeholder = NULL, $blob_suffix = NULL) {
+  public static function bindValues(StatementWrapper $stmt, array &$values, array &$blobs, $placeholder_prefix, array $columnInformation, &$max_placeholder = NULL, $blob_suffix = NULL) {
     if (empty($max_placeholder)) {
       $max_placeholder = 0;
     }
@@ -56,12 +57,12 @@ public static function bindValues(\PDOStatement $stmt, array &$values, array &$b
         $blobs[$blob_key] = fopen('php://memory', 'a');
         fwrite($blobs[$blob_key], $field_value);
         rewind($blobs[$blob_key]);
-        $stmt->bindParam($placeholder, $blobs[$blob_key], \PDO::PARAM_LOB, 0, \PDO::SQLSRV_ENCODING_BINARY);
+        $stmt->getClientStatement()->bindParam($placeholder, $blobs[$blob_key], \PDO::PARAM_LOB, 0, \PDO::SQLSRV_ENCODING_BINARY);
       }
       else {
         // Even though not a blob, make sure we retain a copy of these values.
         $blobs[$blob_key] = $field_value;
-        $stmt->bindParam($placeholder, $blobs[$blob_key], \PDO::PARAM_STR);
+        $stmt->getClientStatement()->bindParam($placeholder, $blobs[$blob_key], \PDO::PARAM_STR);
       }
     }
   }