Define php_ini_scanned_files [closes #3550]

Also make php_ini_loaded_file() non-native, since it is just a stub.
facebook · Sep 30, 2014 · a59f1e8 · a59f1e8
1 parent cfa550c
commit a59f1e8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/hphp/runtime/ext/std/ext_std_options.cpp b/hphp/runtime/ext/std/ext_std_options.cpp
@@ -865,10 +865,6 @@ static bool HHVM_FUNCTION(hphp_memory_stop_interval) {
   return MM().stopStatsInterval();
 }
 
-static Variant HHVM_FUNCTION(php_ini_loaded_file) {
-  return false;
-}
-
 String HHVM_FUNCTION(php_sapi_name) {
   return RuntimeOption::ExecutionMode;
 }
@@ -1224,7 +1220,6 @@ void StandardExtension::initOptions() {
   HHVM_FE(hphp_memory_get_interval_peak_usage);
   HHVM_FE(hphp_memory_start_interval);
   HHVM_FE(hphp_memory_stop_interval);
-  HHVM_FE(php_ini_loaded_file);
   HHVM_FE(php_sapi_name);
   HHVM_FE(php_uname);
   HHVM_FE(phpinfo);

diff --git a/hphp/runtime/ext/std/ext_std_options.php b/hphp/runtime/ext/std/ext_std_options.php
@@ -253,8 +253,16 @@ function hphp_memory_stop_interval(): bool;
 
 /* Retrieve a path to the loaded php.ini file.
  */
-<<__Native>>
-function php_ini_loaded_file(): mixed;
+function php_ini_loaded_file(): mixed {
+  return false;
+}
+
+/* Retrieve a comma-separated list of paths to any additionally loaded ini
+ * files after php.ini.
+ */
+function php_ini_scanned_files(): mixed {
+  return false;
+}
 
 <<__Native>>
 function php_sapi_name(): string;

diff --git a/...quick/ext_options_php_ini_loaded_file.php → .../slow/ext_options/php_ini_loaded_file.php b/...quick/ext_options_php_ini_loaded_file.php → .../slow/ext_options/php_ini_loaded_file.php
diff --git a/...xt_options_php_ini_loaded_file.php.expect → ...xt_options/php_ini_loaded_file.php.expect b/...xt_options_php_ini_loaded_file.php.expect → ...xt_options/php_ini_loaded_file.php.expect
diff --git a/hphp/test/slow/ext_options/php_ini_scanned_files.php b/hphp/test/slow/ext_options/php_ini_scanned_files.php
@@ -0,0 +1,3 @@
+<?php
+
+var_dump(php_ini_scanned_files());
diff --git a/hphp/test/slow/ext_options/php_ini_scanned_files.php.expect b/hphp/test/slow/ext_options/php_ini_scanned_files.php.expect
@@ -0,0 +1 @@
+bool(false)