Merge pull request #177 from remicollet/issue-php82

PHP 8.2
laruence · Jun 25, 2024 · 5258388 · 5258388
2 parents de347c8 + 865d2e0
commit 5258388
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/tests/yar.inc b/tests/yar.inc
@@ -105,17 +105,19 @@ PHP;
 
 function yar_server_cleanup() {
 	$dir = dirname(__FILE__) . DIRECTORY_SEPARATOR . "htdocs";
-	$dp = opendir($dir);
-	while (($f = readdir($dp))) {
-		if (in_array($f, array('.', '..'))) {
-			continue;
-		}
-		$path = $dir . DIRECTORY_SEPARATOR . $f;
-		if (is_file($path)) {
-			unlink($path);
+	if (is_dir($dir)) {
+		$dp = opendir($dir);
+		while (($f = readdir($dp))) {
+			if (in_array($f, array('.', '..'))) {
+				continue;
+			}
+			$path = $dir . DIRECTORY_SEPARATOR . $f;
+			if (is_file($path)) {
+				unlink($path);
+			}
 		}
+		rmdir($dir);
 	}
-	rmdir($dir);
 }
 
 /* For TCP */

diff --git a/yar_request.c b/yar_request.c
@@ -34,7 +34,11 @@
 yar_request_t *php_yar_request_instance(zend_string *method, zend_array *parameters, void **options) /* {{{ */ {
 	yar_request_t *request = emalloc(sizeof(yar_request_t));
 
+#if PHP_VERSION_ID < 80200
 	if (!BG(mt_rand_is_seeded)) {
+#else
+	if (!RANDOM_G(mt19937_seeded)) {
+#endif
 		php_mt_srand(GENERATE_SEED());
 	}