From efd594b8cf829f0655b65ea13d329047e5298ba0 Mon Sep 17 00:00:00 2001
From: v-makouz <v-makouz@microsoft.com>
Date: Mon, 5 Dec 2022 10:48:34 -0800
Subject: [PATCH] Some test fixes for 8.2

---
 test/functional/sqlsrv/TC45_FetchObject.phpt                  | 1 +
 test/functional/sqlsrv/sqlsrv_connect_driver.phpt             | 4 ++--
 test/functional/sqlsrv/sqlsrv_data_classification.phpt        | 2 +-
 test/functional/sqlsrv/sqlsrv_data_classification_ranks.phpt  | 2 +-
 test/functional/sqlsrv/sqlsrv_fetch_object.phpt               | 2 ++
 test/functional/sqlsrv/sqlsrv_fetch_object_2.phpt             | 2 ++
 test/functional/sqlsrv/sqlsrv_fetch_object_class.phpt         | 2 ++
 .../sqlsrv/sqlsrv_fetch_object_unicode_col_name1.phpt         | 2 ++
 .../sqlsrv/sqlsrv_fetch_object_unicode_col_name2.phpt         | 2 ++
 test/functional/sqlsrv/test_largeData.phpt                    | 2 ++
 10 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/test/functional/sqlsrv/TC45_FetchObject.phpt b/test/functional/sqlsrv/TC45_FetchObject.phpt
index 589c4540..66791f88 100644
--- a/test/functional/sqlsrv/TC45_FetchObject.phpt
+++ b/test/functional/sqlsrv/TC45_FetchObject.phpt
@@ -12,6 +12,7 @@ require('skipif_versions_old.inc');
 <?php
 require_once('MsCommon.inc');
 
+#[AllowDynamicProperties]
 class TestClass
 {
     public function __construct($a1, $a2, $a3)
diff --git a/test/functional/sqlsrv/sqlsrv_connect_driver.phpt b/test/functional/sqlsrv/sqlsrv_connect_driver.phpt
index 24ae97e8..a3f05e53 100644
--- a/test/functional/sqlsrv/sqlsrv_connect_driver.phpt
+++ b/test/functional/sqlsrv/sqlsrv_connect_driver.phpt
@@ -117,11 +117,11 @@ function testEncryptedWithODBC($msodbcsqlMaj, $server, $connectionOptions)
 
 function testWrongODBC($msodbcsqlMaj, $server, $connectionOptions)
 {
-    $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($server, $connectionOptions, "Connect with ODBC 18", $expected);
+    connectVerifyOutput($server, $connectionOptions, "Connect with ODBC 13", $expected);
 }
 
 ?>
diff --git a/test/functional/sqlsrv/sqlsrv_data_classification.phpt b/test/functional/sqlsrv/sqlsrv_data_classification.phpt
index ab06cce6..eab60269 100644
--- a/test/functional/sqlsrv/sqlsrv_data_classification.phpt
+++ b/test/functional/sqlsrv/sqlsrv_data_classification.phpt
@@ -61,7 +61,7 @@ function isDataClassSupported($conn, &$driverCapable)
 
     // ODBC Driver must be 17.2 or above
     $driverCapable = true;
-    if ($version[0] < 17 || $version[1] < 2) {
+    if ($version[0] < 17 || ($version[0] == 17 && $version[1] < 2)) {
         $driverCapable = false;
         return false;
     }
diff --git a/test/functional/sqlsrv/sqlsrv_data_classification_ranks.phpt b/test/functional/sqlsrv/sqlsrv_data_classification_ranks.phpt
index c79f302b..6763c300 100644
--- a/test/functional/sqlsrv/sqlsrv_data_classification_ranks.phpt
+++ b/test/functional/sqlsrv/sqlsrv_data_classification_ranks.phpt
@@ -63,7 +63,7 @@ function isDataClassSupported($conn, &$driverCapable)
 
     // ODBC Driver must be 17.2 or above
     $driverCapable = true;
-    if ($version[0] < 17 || $version[1] < 2) {
+    if ($version[0] < 17 || ($version[0] == 17 && $version[1] < 2)) {
         $driverCapable = false;
         return false;
     }
diff --git a/test/functional/sqlsrv/sqlsrv_fetch_object.phpt b/test/functional/sqlsrv/sqlsrv_fetch_object.phpt
index 857b645b..74501782 100644
--- a/test/functional/sqlsrv/sqlsrv_fetch_object.phpt
+++ b/test/functional/sqlsrv/sqlsrv_fetch_object.phpt
@@ -5,6 +5,7 @@ Test for fetch_object
 --FILE--
 <?php
 
+#[AllowDynamicProperties]
 class foo
 {
     public $stuff = "stuff";
@@ -25,6 +26,7 @@ class foo
     }
 }
 
+#[AllowDynamicProperties]
 class foo_noargs
 {
     public $stuff = "stuff";
diff --git a/test/functional/sqlsrv/sqlsrv_fetch_object_2.phpt b/test/functional/sqlsrv/sqlsrv_fetch_object_2.phpt
index 11fc5a91..87e15453 100644
--- a/test/functional/sqlsrv/sqlsrv_fetch_object_2.phpt
+++ b/test/functional/sqlsrv/sqlsrv_fetch_object_2.phpt
@@ -5,6 +5,7 @@ Test for fetch_object
 --FILE--
 <?php
 
+#[AllowDynamicProperties]
 class foo
 {
     public $stuff = "stuff";
@@ -25,6 +26,7 @@ class foo
     }
 }
 
+#[AllowDynamicProperties]
 class foo_noargs
 {
     public $stuff = "stuff";
diff --git a/test/functional/sqlsrv/sqlsrv_fetch_object_class.phpt b/test/functional/sqlsrv/sqlsrv_fetch_object_class.phpt
index 95645c0a..53501f25 100644
--- a/test/functional/sqlsrv/sqlsrv_fetch_object_class.phpt
+++ b/test/functional/sqlsrv/sqlsrv_fetch_object_class.phpt
@@ -4,6 +4,7 @@ Test insert various data types and fetch as strings
 <?php
 require_once('MsCommon.inc');
 
+#[AllowDynamicProperties]
 class TestClass2
 {
     public function __construct($a1, $a2)
@@ -12,6 +13,7 @@ class TestClass2
     }
 }
 
+#[AllowDynamicProperties]
 class TestClass3
 {
     public function __construct($a1, $a2, $a3)
diff --git a/test/functional/sqlsrv/sqlsrv_fetch_object_unicode_col_name1.phpt b/test/functional/sqlsrv/sqlsrv_fetch_object_unicode_col_name1.phpt
index 407e448f..bbef678c 100644
--- a/test/functional/sqlsrv/sqlsrv_fetch_object_unicode_col_name1.phpt
+++ b/test/functional/sqlsrv/sqlsrv_fetch_object_unicode_col_name1.phpt
@@ -5,6 +5,7 @@ Test for fetch_object with Unicode column name
 --FILE--
 <?php
 
+#[AllowDynamicProperties]
 class foo
 {
     public $stuff = "stuff";
@@ -25,6 +26,7 @@ class foo
     }
 }
 
+#[AllowDynamicProperties]
 class foo_noargs
 {
     public $stuff = "stuff";
diff --git a/test/functional/sqlsrv/sqlsrv_fetch_object_unicode_col_name2.phpt b/test/functional/sqlsrv/sqlsrv_fetch_object_unicode_col_name2.phpt
index 7f5e6dbb..ddf2429c 100644
--- a/test/functional/sqlsrv/sqlsrv_fetch_object_unicode_col_name2.phpt
+++ b/test/functional/sqlsrv/sqlsrv_fetch_object_unicode_col_name2.phpt
@@ -6,6 +6,7 @@ sqlsrv_fetch_object() into a class with Unicode column name
 <?php
 
 // Define the Product class
+#[AllowDynamicProperties]
 class Product
 {
     public function __construct($ID, $UID)
@@ -37,6 +38,7 @@ class Product
     }
 }
 
+#[AllowDynamicProperties]
 class Sample extends Product
 {
     public function __construct($ID)
diff --git a/test/functional/sqlsrv/test_largeData.phpt b/test/functional/sqlsrv/test_largeData.phpt
index 72feabf8..e7ed905a 100644
--- a/test/functional/sqlsrv/test_largeData.phpt
+++ b/test/functional/sqlsrv/test_largeData.phpt
@@ -4,6 +4,8 @@ Send a large amount (10MB) using encryption. In a Linux CI environment use a sma
 <?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
+
+#[AllowDynamicProperties]
 class my_stream
 {
     public $total_read = 0;