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 ++--
 test/test_php_application.py      | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'test')

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'));
 ?>
diff --git a/test/test_php_application.py b/test/test_php_application.py
index 48fab5ee..063d3e0c 100644
--- a/test/test_php_application.py
+++ b/test/test_php_application.py
@@ -198,9 +198,9 @@ class TestPHPApplication(TestApplicationPHP):
 
         resp = self.get(url='/?var1=val1&var2=&var3')
         assert resp['headers']['X-Var-1'] == 'val1', 'GET variables'
-        assert resp['headers']['X-Var-2'] == '1', 'GET variables 2'
-        assert resp['headers']['X-Var-3'] == '1', 'GET variables 3'
-        assert resp['headers']['X-Var-4'] == '', 'GET variables 4'
+        assert resp['headers']['X-Var-2'] == '', 'GET variables 2'
+        assert resp['headers']['X-Var-3'] == '', 'GET variables 3'
+        assert resp['headers']['X-Var-4'] == 'not set', 'GET variables 4'
 
     def test_php_application_post_variables(self):
         self.load('post_variables')
@@ -214,8 +214,8 @@ class TestPHPApplication(TestApplicationPHP):
             body='var1=val1&var2=',
         )
         assert resp['headers']['X-Var-1'] == 'val1', 'POST variables'
-        assert resp['headers']['X-Var-2'] == '1', 'POST variables 2'
-        assert resp['headers']['X-Var-3'] == '', 'POST variables 3'
+        assert resp['headers']['X-Var-2'] == '', 'POST variables 2'
+        assert resp['headers']['X-Var-3'] == 'not set', 'POST variables 3'
 
     def test_php_application_cookies(self):
         self.load('cookies')
-- 
cgit