From 93802526c06de30f9a4ace7bc8ed93f34ae010b3 Mon Sep 17 00:00:00 2001
From: v-makouz <v-makouz@microsoft.com>
Date: Thu, 8 Dec 2022 10:16:14 -0800
Subject: [PATCH] Some PDO test fixes

---
 test/functional/pdo_sqlsrv/PDO31_Statement.phpt               | 1 +
 test/functional/pdo_sqlsrv/PDO37_FetchMode.phpt               | 1 +
 test/functional/pdo_sqlsrv/PDO47_FetchClass.phpt              | 3 +++
 test/functional/pdo_sqlsrv/PDO49_FetchFunc.phpt               | 2 ++
 test/functional/pdo_sqlsrv/PDO50_FetchObject.phpt             | 1 +
 test/functional/pdo_sqlsrv/PDO94_Extend1.phpt                 | 2 ++
 test/functional/pdo_sqlsrv/pdo_connect_driver.phpt            | 4 ++--
 .../functional/pdo_sqlsrv/pdo_fetch_fetchinto_query_args.phpt | 3 +++
 test/functional/pdo_sqlsrv/pdo_simple_update_variants.phpt    | 1 +
 9 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/test/functional/pdo_sqlsrv/PDO31_Statement.phpt b/test/functional/pdo_sqlsrv/PDO31_Statement.phpt
index f082113c..adb1ab2a 100644
--- a/test/functional/pdo_sqlsrv/PDO31_Statement.phpt
+++ b/test/functional/pdo_sqlsrv/PDO31_Statement.phpt
@@ -59,6 +59,7 @@ function ExecStmt()
     EndTest($testName);
 }
 
+#[AllowDynamicProperties]
 class Test
 {
     function __construct($name = 'N/A')
diff --git a/test/functional/pdo_sqlsrv/PDO37_FetchMode.phpt b/test/functional/pdo_sqlsrv/PDO37_FetchMode.phpt
index 5067ea90..34e6c7d2 100644
--- a/test/functional/pdo_sqlsrv/PDO37_FetchMode.phpt
+++ b/test/functional/pdo_sqlsrv/PDO37_FetchMode.phpt
@@ -48,6 +48,7 @@ function FetchMode()
     EndTest($testName);
 }
 
+#[AllowDynamicProperties]
 class Test
 {
     function __construct($name = 'N/A')
diff --git a/test/functional/pdo_sqlsrv/PDO47_FetchClass.phpt b/test/functional/pdo_sqlsrv/PDO47_FetchClass.phpt
index 3a40b5b6..f4c8b298 100644
--- a/test/functional/pdo_sqlsrv/PDO47_FetchClass.phpt
+++ b/test/functional/pdo_sqlsrv/PDO47_FetchClass.phpt
@@ -72,6 +72,7 @@ function FetchAll()
     EndTest($testName);
 }
 
+#[AllowDynamicProperties]
 class Test1
 {
     public function __construct()
@@ -80,6 +81,7 @@ class Test1
     }
 }
 
+#[AllowDynamicProperties]
 class Test2
 {
     public function __construct()
@@ -88,6 +90,7 @@ class Test2
     }
 }
 
+#[AllowDynamicProperties]
 class Test3
 {
     public function __construct()
diff --git a/test/functional/pdo_sqlsrv/PDO49_FetchFunc.phpt b/test/functional/pdo_sqlsrv/PDO49_FetchFunc.phpt
index 43e9b6c8..b9398ff6 100644
--- a/test/functional/pdo_sqlsrv/PDO49_FetchFunc.phpt
+++ b/test/functional/pdo_sqlsrv/PDO49_FetchFunc.phpt
@@ -64,6 +64,7 @@ function FetchAll()
     EndTest($testName);
 }
 
+#[AllowDynamicProperties]
 class DerivedStatement extends PDOStatement
 {
     private function __construct($name, $conn)
@@ -78,6 +79,7 @@ class DerivedStatement extends PDOStatement
     }
 }
 
+#[AllowDynamicProperties]
 class Test1
 {
     public function __construct($id, $val)
diff --git a/test/functional/pdo_sqlsrv/PDO50_FetchObject.phpt b/test/functional/pdo_sqlsrv/PDO50_FetchObject.phpt
index c925323b..ce777ac5 100644
--- a/test/functional/pdo_sqlsrv/PDO50_FetchObject.phpt
+++ b/test/functional/pdo_sqlsrv/PDO50_FetchObject.phpt
@@ -10,6 +10,7 @@ PHPT_EXEC=true
 <?php
 include 'MsCommon.inc';
 
+#[AllowDynamicProperties]
 class TestClass
 {
     private $set_calls = 0;
diff --git a/test/functional/pdo_sqlsrv/PDO94_Extend1.phpt b/test/functional/pdo_sqlsrv/PDO94_Extend1.phpt
index cfe413d3..d2961f52 100644
--- a/test/functional/pdo_sqlsrv/PDO94_Extend1.phpt
+++ b/test/functional/pdo_sqlsrv/PDO94_Extend1.phpt
@@ -48,6 +48,7 @@ function Extend()
     EndTest($testName);
 }
 
+#[AllowDynamicProperties]
 class ExPDO extends PDO
 {
     public $test1 = 1;
@@ -74,6 +75,7 @@ class ExPDO extends PDO
     }
 }
 
+#[AllowDynamicProperties]
 class ExPDOStatement extends PDOStatement
 {
     protected function __construct()
diff --git a/test/functional/pdo_sqlsrv/pdo_connect_driver.phpt b/test/functional/pdo_sqlsrv/pdo_connect_driver.phpt
index 620e74d9..41180117 100644
--- a/test/functional/pdo_sqlsrv/pdo_connect_driver.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_connect_driver.phpt
@@ -122,11 +122,11 @@ function testWrongODBC()
 {
     global $msodbcsqlMaj;
 
-    $value = "ODBC Driver 18 for SQL Server";
+    $value = "ODBC Driver 13 for SQL Server";
     $connectionOptions = "Driver = $value;";
     $expected = "The specified ODBC Driver is not found.";
 
-    connectVerifyOutput($connectionOptions, "Connect with ODBC 18", $expected);
+    connectVerifyOutput($connectionOptions, "Connect with ODBC 13", $expected);
 }
 
 ?>
diff --git a/test/functional/pdo_sqlsrv/pdo_fetch_fetchinto_query_args.phpt b/test/functional/pdo_sqlsrv/pdo_fetch_fetchinto_query_args.phpt
index 50a5cf1a..0aa66410 100644
--- a/test/functional/pdo_sqlsrv/pdo_fetch_fetchinto_query_args.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_fetch_fetchinto_query_args.phpt
@@ -8,6 +8,8 @@ This test should not use temporary table as it might occasionally cause deadlock
 <?php
 
 include 'MsCommon.inc';
+
+#[AllowDynamicProperties]
 class PdoTestClass
 {
     function __construct ()
@@ -16,6 +18,7 @@ class PdoTestClass
     }
 }
 
+#[AllowDynamicProperties]
 class PdoTestClass2
 {
     function __construct ($a1, $a2)
diff --git a/test/functional/pdo_sqlsrv/pdo_simple_update_variants.phpt b/test/functional/pdo_sqlsrv/pdo_simple_update_variants.phpt
index 86c5e3a7..f9636190 100644
--- a/test/functional/pdo_sqlsrv/pdo_simple_update_variants.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_simple_update_variants.phpt
@@ -8,6 +8,7 @@ ORDER BY should work with sql_variants
 <?php
 require_once("MsCommon_mid-refactor.inc");
 
+#[AllowDynamicProperties]
 class Food
 {
     public function getFood()