From 244ffb2829cfbac26e013988474184d6050504fe Mon Sep 17 00:00:00 2001
From: Tiago Natel de Moura <t.nateldemoura@f5.com>
Date: Tue, 25 Aug 2020 13:48:33 +0100
Subject: Tests: PHP extension mounts.

---
 test/php/list-extensions/index.php | 11 +++++++++++
 test/php/list-extensions/php.ini   |  1 +
 2 files changed, 12 insertions(+)
 create mode 100644 test/php/list-extensions/index.php
 create mode 100644 test/php/list-extensions/php.ini

(limited to 'test/php')

diff --git a/test/php/list-extensions/index.php b/test/php/list-extensions/index.php
new file mode 100644
index 00000000..d6eb40d0
--- /dev/null
+++ b/test/php/list-extensions/index.php
@@ -0,0 +1,11 @@
+<?php
+
+function quote($str) {
+    return '"' . $str . '"';
+}
+
+header('Content-Type: application/json');
+
+print "[" . join(",", array_map('quote', get_loaded_extensions())) . "]";
+
+?>
diff --git a/test/php/list-extensions/php.ini b/test/php/list-extensions/php.ini
new file mode 100644
index 00000000..5848a0f2
--- /dev/null
+++ b/test/php/list-extensions/php.ini
@@ -0,0 +1 @@
+extension=json.so
-- 
cgit 


From 2821b3347c026ae171228146c5ccd0bd7408358f Mon Sep 17 00:00:00 2001
From: Valentin Bartenev <vbart@nginx.com>
Date: Tue, 6 Oct 2020 18:12:05 +0300
Subject: PHP: compatibility with 8.0.0 RC1.

This closes #474 PR on GitHub.
---
 test/php/get_variables/index.php  | 6 +++---
 test/php/post_variables/index.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'test/php')

diff --git a/test/php/get_variables/index.php b/test/php/get_variables/index.php
index dd7ef985..d6eb7d6b 100644
--- a/test/php/get_variables/index.php
+++ b/test/php/get_variables/index.php
@@ -1,7 +1,7 @@
 <?php
 header('Content-Length: 0');
 header('X-Var-1: ' . $_GET['var1']);
-header('X-Var-2: ' . $_GET['var2'] . isset($_GET['var2']));
-header('X-Var-3: ' . $_GET['var3'] . isset($_GET['var3']));
-header('X-Var-4: ' . $_GET['var4'] . isset($_GET['var4']));
+header('X-Var-2: ' . (isset($_GET['var2']) ? $_GET['var2'] : 'not set'));
+header('X-Var-3: ' . (isset($_GET['var3']) ? $_GET['var3'] : 'not set'));
+header('X-Var-4: ' . (isset($_GET['var4']) ? $_GET['var4'] : 'not set'));
 ?>
diff --git a/test/php/post_variables/index.php b/test/php/post_variables/index.php
index 5ea17324..8981d54d 100644
--- a/test/php/post_variables/index.php
+++ b/test/php/post_variables/index.php
@@ -1,6 +1,6 @@
 <?php
 header('Content-Length: 0');
 header('X-Var-1: ' . $_POST['var1']);
-header('X-Var-2: ' . $_POST['var2'] . isset($_POST['var2']));
-header('X-Var-3: ' . $_POST['var3'] . isset($_POST['var3']));
+header('X-Var-2: ' . (isset($_POST['var2']) ? $_POST['var2'] : 'not set'));
+header('X-Var-3: ' . (isset($_POST['var3']) ? $_POST['var3'] : 'not set'));
 ?>
-- 
cgit