Merge branch 'master' into jit-dynasm

dstogov · dstogov · commit 082f7c9785fd · 2017-08-17T08:04:33.000+03:00
* master:
  EXPECT instead of EXPECTF
  Fixed: tests not written to pass on Windows
  cli_get_process_title() may not be empty before set
  Not skipping test on Windows and test against CLI instead
  Added: tests for cli_get_process_title / cli_set_process_title
  Do the revert properly, and put back fraction support in 7.1
  Fixed 32-bit tests as well.
  Revert "Upgrade timelib to 2017.05beta7"
  Revert "Remove removed header files from configuration files."
  Fixed stupid test
  Added timelib version to phpinfo()
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -922,6 +922,7 @@ PHP_MINFO_FUNCTION(date)
 
 	php_info_print_table_start();
 	php_info_print_table_row(2, "date/time support", "enabled");
+	php_info_print_table_row(2, "timelib version", TIMELIB_ASCII_VERSION);
 	php_info_print_table_row(2, "\"Olson\" Timezone Database Version", tzdb->version);
 	php_info_print_table_row(2, "Timezone Database", php_date_global_timezone_db_enabled ? "external" : "internal");
 	php_info_print_table_row(2, "Default timezone", guess_timezone(tzdb));
diff --git a/ext/date/tests/date_sunrise_variation2.phpt b/ext/date/tests/date_sunrise_variation2.phpt
@@ -125,7 +125,7 @@ Warning: date_sunrise() expects parameter 2 to be integer, float given in %s on
 bool(false)
 
 --float .5--
-int(1218174483)
+int(1218174468)
 
 --empty array--
 
@@ -148,22 +148,22 @@ Warning: date_sunrise() expects parameter 2 to be integer, array given in %s on
 bool(false)
 
 --uppercase NULL--
-int(1218174483)
+int(1218174468)
 
 --lowercase null--
-int(1218174483)
+int(1218174468)
 
 --lowercase true--
-string(5) "06:48"
+string(5) "06:47"
 
 --lowercase false--
-int(1218174483)
+int(1218174468)
 
 --uppercase TRUE--
-string(5) "06:48"
+string(5) "06:47"
 
 --uppercase FALSE--
-int(1218174483)
+int(1218174468)
 
 --empty string DQ--
 
@@ -206,8 +206,8 @@ Warning: date_sunrise() expects parameter 2 to be integer, object given in %s on
 bool(false)
 
 --undefined var--
-int(1218174483)
+int(1218174468)
 
 --unset var--
-int(1218174483)
+int(1218174468)
 ===DONE===
diff --git a/ext/date/tests/date_sunset_variation2.phpt b/ext/date/tests/date_sunset_variation2.phpt
@@ -125,7 +125,7 @@ Warning: date_sunset() expects parameter 2 to be integer, float given in %s on l
 bool(false)
 
 --float .5--
-int(1218199253)
+int(1218199264)
 
 --empty array--
 
@@ -148,22 +148,22 @@ Warning: date_sunset() expects parameter 2 to be integer, array given in %s on l
 bool(false)
 
 --uppercase NULL--
-int(1218199253)
+int(1218199264)
 
 --lowercase null--
-int(1218199253)
+int(1218199264)
 
 --lowercase true--
-string(5) "18:10"
+string(5) "18:11"
 
 --lowercase false--
-int(1218199253)
+int(1218199264)
 
 --uppercase TRUE--
-string(5) "18:10"
+string(5) "18:11"
 
 --uppercase FALSE--
-int(1218199253)
+int(1218199264)
 
 --empty string DQ--
 
@@ -206,8 +206,8 @@ Warning: date_sunset() expects parameter 2 to be integer, object given in %s on
 bool(false)
 
 --undefined var--
-int(1218199253)
+int(1218199264)
 
 --unset var--
-int(1218199253)
-===DONE===
+int(1218199264)
+===DONE===
diff --git a/ext/reflection/tests/026.phpt b/ext/reflection/tests/026.phpt
@@ -20,6 +20,7 @@ Version => %s
 date
 
 date/time support => enabled
+timelib version => %s
 "Olson" Timezone Database Version => %s
 Timezone Database => %s
 Default timezone => %s
diff --git a/sapi/cli/tests/cli_get_process_title_basic.phpt b/sapi/cli/tests/cli_get_process_title_basic.phpt
@@ -0,0 +1,18 @@
+--TEST--
+cli_get_process_title() function : basic functionality
+--CREDITS--
+Patrick Allaert patrickallaert@php.net
+@nephp #nephp17
+--SKIPIF--
+<?php
+if (PHP_SAPI !== "cli")
+  die("skip");
+?>
+--FILE--
+<?php
+if (cli_set_process_title("title") && cli_get_process_title() === "title")
+  echo "Title correctly retrieved!\n";
+
+?>
+--EXPECT--
+Title correctly retrieved!
diff --git a/sapi/cli/tests/cli_get_process_title_error.phpt b/sapi/cli/tests/cli_get_process_title_error.phpt
@@ -0,0 +1,16 @@
+--TEST--
+cli_get_process_title() function : error conditions
+--CREDITS--
+Patrick Allaert patrickallaert@php.net
+@nephp #nephp17
+--SKIPIF--
+<?php
+if (PHP_SAPI !== "cli")
+  die("skip");
+?>
+--FILE--
+<?php
+cli_get_process_title("foo");
+?>
+--EXPECTF--
+Warning: cli_get_process_title() expects exactly 0 parameters, 1 given in %scli_get_process_title_error.php on line 2
diff --git a/sapi/cli/tests/cli_set_process_title_basic.phpt b/sapi/cli/tests/cli_set_process_title_basic.phpt
@@ -0,0 +1,19 @@
+--TEST--
+cli_set_process_title() function : basic functionality
+--CREDITS--
+Patrick Allaert patrickallaert@php.net
+@nephp #nephp17
+--SKIPIF--
+<?php
+if (PHP_SAPI !== "cli")
+  die("skip");
+?>
+--FILE--
+<?php
+if (cli_set_process_title("title") === true &&
+    cli_get_process_title() === "title")
+  echo "Successfully set title\n";
+
+?>
+--EXPECT--
+Successfully set title
diff --git a/sapi/cli/tests/cli_set_process_title_error.phpt b/sapi/cli/tests/cli_set_process_title_error.phpt
@@ -0,0 +1,19 @@
+--TEST--
+cli_set_process_title() function : error conditions
+--CREDITS--
+Patrick Allaert patrickallaert@php.net
+@nephp #nephp17
+--SKIPIF--
+<?php
+if (PHP_SAPI !== "cli")
+  die("skip");
+?>
+--FILE--
+<?php
+cli_set_process_title();
+cli_set_process_title("foo", "bar");
+?>
+--EXPECTF--
+Warning: cli_set_process_title() expects exactly 1 parameter, 0 given in %scli_set_process_title_error.php on line 2
+
+Warning: cli_set_process_title() expects exactly 1 parameter, 2 given in %scli_set_process_title_error.php on line 3
