Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Define php_ini_scanned_files [closes #3550] #3872

Closed
wants to merge 1 commit into from
Closed

Define php_ini_scanned_files [closes #3550] #3872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions hphp/runtime/ext/std/ext_std_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
Expand Down
12 changes: 10 additions & 2 deletions hphp/runtime/ext/std/ext_std_options.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
0 ...quick/ext_options_php_ini_loaded_file.php → .../slow/ext_options/php_ini_loaded_file.php
View file
Open in desktop
File renamed without changes.
0 ...xt_options_php_ini_loaded_file.php.expect → ...xt_options/php_ini_loaded_file.php.expect
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions hphp/test/slow/ext_options/php_ini_scanned_files.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?php

var_dump(php_ini_scanned_files());
1 change: 1 addition & 0 deletions hphp/test/slow/ext_options/php_ini_scanned_files.php.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bool(false)