Update test cases

Author: kamil-tekiela

ext/session/tests/015.phpt

@@ -20,13 +20,16 @@ error_reporting(E_ALL);
 
 session_id("test015");
 session_start();
+$sid = SID;
 ?>
-<a href="/link?<?php echo SID; ?>">
+<a href="/link?<?=$sid ?>">
 <?php
 session_destroy();
 ?>
---EXPECT--
+--EXPECTF--
 Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
 
 Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
+
+Deprecated: Constant SID is deprecated in %s on line 6
 <a href="/link?PHPSESSID=test015&PHPSESSID=test015">

ext/session/tests/021.phpt

@@ -59,10 +59,12 @@ ini_set("url_rewriter.tags", "a=href,fieldset=,area=href,frame=src,input=src");
 
 session_destroy();
 ?>
---EXPECT--
+--EXPECTF--
 Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
 
 Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
+
+Deprecated: ini_set(): Usage of session.trans_sid_hosts INI setting is deprecated in %s on line 4
 <form action="//bad.net/do.php">
 <fieldset>
 <form action="//php.net/do.php"><input type="hidden" name="PHPSESSID" value="test021" />

ext/session/tests/bug72940.phpt

@@ -33,9 +33,13 @@ session_destroy();
 ?>
 --EXPECTF--
 Deprecated: ini_set(): Disabling session.use_only_cookies INI setting is deprecated in %s on line 6
+
+Deprecated: Constant SID is deprecated in %s on line 8
 string(12) "bug72940test"
 string(0) ""
 
 Deprecated: ini_set(): Disabling session.use_only_cookies INI setting is deprecated in %s on line 13
+
+Deprecated: Constant SID is deprecated in %s on line 15
 string(11) "bug72940get"
 string(21) "PHPSESSID=bug72940get"

ext/session/tests/bug74892.phpt

@@ -10,6 +10,7 @@ session
 <?php include('skipif.inc'); ?>
 --FILE--
 <?php
+ob_start();
 ini_set('session.trans_sid_hosts','php.net'); // This value cannot be set in the INI file
 session_id('sessionidhere');
 session_start();
@@ -19,10 +20,12 @@ session_start();
 <p><a href="index.php#place">External link with anchor</a></p>
 <p><a href="http://php.net#foo">External link with anchor 2</a></p>
 <p><a href="#place">Internal link</a></p>
---EXPECT--
+--EXPECTF--
 Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
 
 Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
+
+Deprecated: ini_set(): Usage of session.trans_sid_hosts INI setting is deprecated in %s on line 3
 <p><a href="index.php?PHPSESSID=sessionidhere">Click This Anchor Tag!</a></p>
 <p><a href="index.php?PHPSESSID=sessionidhere#place">External link with anchor</a></p>
 <p><a href="http://php.net?PHPSESSID=sessionidhere#foo">External link with anchor 2</a></p>

ext/session/tests/gh13891.phpt

@@ -14,4 +14,13 @@ session
 // We *must* set it here because the bug only triggers on a runtime edit
 ini_set('session.trans_sid_hosts','php.net');
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
+
+Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
+
+Deprecated: PHP Startup: Usage of session.trans_sid_hosts INI setting is deprecated in Unknown on line 0
+
+Deprecated: ini_set(): Usage of session.trans_sid_hosts INI setting is deprecated in %s on line 3
+
+Deprecated: PHP Request Shutdown: Usage of session.trans_sid_hosts INI setting is deprecated in Unknown on line 0

ext/session/tests/session_basic5.phpt

@@ -236,10 +236,12 @@ var_dump(session_destroy());
 
 ob_end_flush();
 ?>
---EXPECT--
+--EXPECTF--
 Deprecated: PHP Startup: Disabling session.use_only_cookies INI setting is deprecated in Unknown on line 0
 
 Deprecated: PHP Startup: Enabling session.use_trans_sid INI setting is deprecated in Unknown on line 0
+
+Deprecated: ini_set(): Usage of session.trans_sid_hosts INI setting is deprecated in %s on line 5
 *** Testing basic session functionality : variation5 use_trans_sid ***
 *** Test trans sid ***
 

ext/standard/tests/general_functions/output_add_rewrite_var_basic1.phpt

@@ -75,6 +75,8 @@ Test use_trans_sid=1
 <form action="bad://php.net/bar.php" method="get"> </form>
 <form action="//www.php.net/bar.php" method="get"> </form>
 --EXPECTF--
+Deprecated: ini_set(): Usage of session.trans_sid_hosts INI setting is deprecated in %s on line 5
+
 Deprecated: ini_set(): Disabling session.use_only_cookies INI setting is deprecated in %s on line 6
 Without session
 <a href="?%3CNAME%3E=%3CVALUE%3E"> </a>

ext/standard/tests/general_functions/output_add_rewrite_var_basic2.phpt

@@ -75,6 +75,7 @@ Test use_trans_sid=1
 <form action="bad://php.net/bar.php" method="get"> </a>
 <form action="//www.php.net/bar.php" method="get"> </a>
 --EXPECTF--
+Deprecated: ini_set(): Usage of session.trans_sid_hosts INI setting is deprecated in %s on line 5
 Without session
 <a href="?%3CNAME%3E=%3CVALUE%3E"> </a>
 <a href="./foo.php?%3CNAME%3E=%3CVALUE%3E"> </a>

ext/standard/tests/general_functions/url_rewriting_basic1.phpt

@@ -77,6 +77,7 @@ echo "\nURL-Rewriting with transparent session id support without output_add_rew
 echo $testTags;
 
 --EXPECTF--
+Deprecated: ini_set(): Usage of session.trans_sid_hosts INI setting is deprecated in %s on line 44
 URL-Rewriting with output_add_rewrite_var() without transparent session id support
 
 <a href="?%3Cname%3E=%3Cvalue%3E"></a>

ext/standard/tests/general_functions/url_rewriting_basic2.phpt

@@ -88,6 +88,7 @@ echo "\nURL-Rewriting with output_add_rewrite_var() without transparent session
 echo $testTags;
 
 --EXPECTF--
+Deprecated: ini_set(): Usage of session.trans_sid_hosts INI setting is deprecated in %s on line 44
 URL-Rewriting with output_add_rewrite_var() without transparent session id support
 
 <a href="?%3Cname%3E=%3Cvalue%3E"></a>

ext/standard/tests/general_functions/url_rewriting_basic3.phpt

@@ -81,6 +81,8 @@ echo "\nURL-Rewriting with transparent session id support without output_add_rew
 echo $testTags;
 
 --EXPECTF--
+Deprecated: ini_set(): Usage of session.trans_sid_hosts INI setting is deprecated in %s on line 44
+
 Deprecated: ini_set(): Disabling session.use_only_cookies INI setting is deprecated in %s on line 47
 
 Deprecated: ini_set(): Enabling session.use_trans_sid INI setting is deprecated in %s on line 50