From 5bb8e4790004abc5b479ccb87240c331b1d86a58 Mon Sep 17 00:00:00 2001 From: Fred Emmott Date: Fri, 7 Mar 2014 16:21:31 -0800 Subject: [PATCH] Fix stream_get_filters Previously array('name1' => 'Class1', ... ), now just array('name1', 'name2', ...); Reviewed By: @ptarjan Differential Revision: D1208949 --- hphp/runtime/ext/stream/ext_stream-user-filters.cpp | 3 ++- hphp/test/slow/streams/stream_get_filters.php | 3 +++ hphp/test/slow/streams/stream_get_filters.php.expect | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 hphp/test/slow/streams/stream_get_filters.php create mode 100644 hphp/test/slow/streams/stream_get_filters.php.expect diff --git a/hphp/runtime/ext/stream/ext_stream-user-filters.cpp b/hphp/runtime/ext/stream/ext_stream-user-filters.cpp index a503631195d..afcc5ee5e36 100644 --- a/hphp/runtime/ext/stream/ext_stream-user-filters.cpp +++ b/hphp/runtime/ext/stream/ext_stream-user-filters.cpp @@ -17,6 +17,7 @@ #include "hphp/runtime/ext/stream/ext_stream-user-filters.h" #include "hphp/runtime/base/base-includes.h" +#include "hphp/runtime/ext/ext_array.h" #include "hphp/system/systemlib.h" namespace HPHP { @@ -261,7 +262,7 @@ Array HHVM_FUNCTION(stream_get_filters) { if (UNLIKELY(filters.isNull())) { return Array::Create(); } - return filters; + return f_array_keys(filters).toArray(); } Variant HHVM_FUNCTION(stream_filter_append, diff --git a/hphp/test/slow/streams/stream_get_filters.php b/hphp/test/slow/streams/stream_get_filters.php new file mode 100644 index 00000000000..41cdb86bd89 --- /dev/null +++ b/hphp/test/slow/streams/stream_get_filters.php @@ -0,0 +1,3 @@ +