Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2: Skip .NET tests if mscoree is not available (#14281)
php · May 20, 2024 · 59744a7 · 59744a7
2 parents 9c9f49a + 98288a2
commit 59744a7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/ext/com_dotnet/tests/bug73679.phpt b/ext/com_dotnet/tests/bug73679.phpt
@@ -5,6 +5,7 @@ com_dotnet
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only");
+if (!class_exists("dotnet")) die("skip mscoree not available");
 ?>
 --FILE--
 <?php

diff --git a/ext/com_dotnet/tests/bug77177.phpt b/ext/com_dotnet/tests/bug77177.phpt
@@ -2,6 +2,10 @@
 Bug #77177 (Serializing or unserializing COM objects crashes)
 --EXTENSIONS--
 com_dotnet
+--SKIPIF--
+<?php
+if (!class_exists("dotnet")) die("skip mscoree not available");
+?>
 --FILE--
 <?php
 $com = new COM("WScript.Shell");