1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  Fix include paths for new pgsql tests
This commit is contained in:
Gina Peter Banyard
2025-11-04 04:42:53 +00:00

View File

@@ -4,7 +4,7 @@ pg_fetch_object() with abstract class name
pgsql pgsql
--SKIPIF-- --SKIPIF--
<?php <?php
include("skipif.inc"); include("inc/skipif.inc");
?> ?>
--FILE-- --FILE--
<?php <?php
@@ -17,7 +17,7 @@ enum E {
case A; case A;
} }
include "config.inc"; include "inc/config.inc";
$table_name = "pg_fetch_object_abstract_class"; $table_name = "pg_fetch_object_abstract_class";
$db = pg_connect($conn_str); $db = pg_connect($conn_str);
pg_query($db, "CREATE TABLE {$table_name} (a integer, b text)"); pg_query($db, "CREATE TABLE {$table_name} (a integer, b text)");
@@ -49,7 +49,7 @@ try {
?> ?>
--CLEAN-- --CLEAN--
<?php <?php
include('config.inc'); include('inc/config.inc');
$db = @pg_connect($conn_str); $db = @pg_connect($conn_str);
@pg_query($db, "DROP TABLE IF EXISTS pg_fetch_object_abstract_class cascade"); @pg_query($db, "DROP TABLE IF EXISTS pg_fetch_object_abstract_class cascade");
?> ?>