From fcf3d948d88bcd8b56e7affc294b1a96c7344cc2 Mon Sep 17 00:00:00 2001
From: Simon Welsh <simon@simon.geek.nz>
Date: Sat, 26 Jul 2014 09:03:24 -0700
Subject: [PATCH] Update some HHI files

Summary: Could really do with a false-able type ;)

Closes https://github.com/facebook/hhvm/pull/3283

Reviewed By: @JoelMarcey

Differential Revision: D1460376

Pulled By: svcscm
---
 hphp/hack/hhi/stdlib/builtins_apache.idl.hhi   |  6 +--
 hphp/hack/hhi/stdlib/builtins_datetime.idl.hhi |  4 +-
 hphp/hack/hhi/stdlib/builtins_json.idl.hhi     | 25 ++++-----
 hphp/hack/hhi/stdlib/builtins_server.idl.hhi   |  2 +-
 hphp/hack/hhi/stdlib/builtins_string.idl.hhi   |  8 +--
 hphp/hack/hhi/stdlib/builtins_url.idl.hhi      |  4 +-
 hphp/hack/hhi/stdlib/bultins_filter.hhi        | 73 ++++++++++++++++++++++++++
 7 files changed, 98 insertions(+), 24 deletions(-)
 create mode 100644 hphp/hack/hhi/stdlib/bultins_filter.hhi

diff --git a/hphp/hack/hhi/stdlib/builtins_apache.idl.hhi b/hphp/hack/hhi/stdlib/builtins_apache.idl.hhi
index c130ab31c29..7ffcbceea6f 100644
--- a/hphp/hack/hhi/stdlib/builtins_apache.idl.hhi
+++ b/hphp/hack/hhi/stdlib/builtins_apache.idl.hhi
@@ -1,4 +1,4 @@
-<?hh     /* -*- php -*- */
+<?hh // decl     /* -*- php -*- */
 /**
  * Copyright (c) 2014, Facebook, Inc.
  * All rights reserved.
@@ -9,8 +9,8 @@
  *
  */
 function apache_note($note_name, $note_value = null) { }
-function apache_request_headers() { }
-function apache_response_headers() { }
+function apache_request_headers(): array<string, string> { }
+function apache_response_headers(): array<string, string> { }
 function apache_setenv($variable, $value, $walk_to_top = false) { }
 function getallheaders() { }
 function virtual($filename) { }
diff --git a/hphp/hack/hhi/stdlib/builtins_datetime.idl.hhi b/hphp/hack/hhi/stdlib/builtins_datetime.idl.hhi
index b82e2641424..2d4ec46f10a 100644
--- a/hphp/hack/hhi/stdlib/builtins_datetime.idl.hhi
+++ b/hphp/hack/hhi/stdlib/builtins_datetime.idl.hhi
@@ -1,4 +1,4 @@
-<?hh     /* -*- php -*- */
+<?hh // decl    /* -*- php -*- */
 /**
  * Copyright (c) 2014, Facebook, Inc.
  * All rights reserved.
@@ -33,7 +33,7 @@ function date_timestamp_get($datetime) { }
 function date_timestamp_set($datetime, $timestamp) { }
 function date_timezone_get($object) { }
 function date_timezone_set($object, $timezone) { }
-function date($format, $timestamp = null) { }
+function date($format, $timestamp = null): string { }
 function getdate($timestamp = null) { }
 function gettimeofday($return_float = false) { }
 function gmdate($format, $timestamp = null) { }
diff --git a/hphp/hack/hhi/stdlib/builtins_json.idl.hhi b/hphp/hack/hhi/stdlib/builtins_json.idl.hhi
index 41d66c91219..4ffcd373b4a 100644
--- a/hphp/hack/hhi/stdlib/builtins_json.idl.hhi
+++ b/hphp/hack/hhi/stdlib/builtins_json.idl.hhi
@@ -8,18 +8,19 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  *
  */
-define('JSON_HEX_TAG', 0);
-define('JSON_HEX_AMP', 0);
-define('JSON_HEX_APOS', 0);
-define('JSON_HEX_QUOT', 0);
-define('JSON_FORCE_OBJECT', 0);
-define('JSON_NUMERIC_CHECK', 0);
-define('JSON_UNESCAPED_SLASHES', 0);
-define('JSON_PRETTY_PRINT', 0);
-define('JSON_FB_LOOSE', 0);
-define('JSON_FB_UNLIMITED', 0);
-define('JSON_FB_EXTRA_ESCAPES', 0);
-define('JSON_FB_COLLECTIONS', 0);
+const int JSON_HEX_TAG = 0;
+const int JSON_HEX_AMP = 0;
+const int JSON_HEX_APOS = 0;
+const int JSON_HEX_QUOT = 0;
+const int JSON_FORCE_OBJECT = 0;
+const int JSON_NUMERIC_CHECK = 0;
+const int JSON_UNESCAPED_SLASHES = 0;
+const int JSON_UNESCAPED_UNICODE = 0;
+const int JSON_PRETTY_PRINT = 0;
+const int JSON_FB_LOOSE = 0;
+const int JSON_FB_UNLIMITED = 0;
+const int JSON_FB_EXTRA_ESCAPES = 0;
+const int JSON_FB_COLLECTIONS = 0;
 function json_encode($value, $options = 0) { }
 function json_decode($json, $assoc = false, $depth = 512, $options = 0) { }
 function json_last_error() { }
diff --git a/hphp/hack/hhi/stdlib/builtins_server.idl.hhi b/hphp/hack/hhi/stdlib/builtins_server.idl.hhi
index 13c2980306f..d36ab3c5a3b 100644
--- a/hphp/hack/hhi/stdlib/builtins_server.idl.hhi
+++ b/hphp/hack/hhi/stdlib/builtins_server.idl.hhi
@@ -15,7 +15,7 @@ function dangling_server_proxy_old_request() { }
 function pagelet_server_is_enabled() { }
 function pagelet_server_task_start($url, $headers = null, $post_data = null, $files = null) { }
 function pagelet_server_task_status($task) { }
-function pagelet_server_task_result($task, &$headers, &$code, $timeout_ms = 0) { }
+function pagelet_server_task_result($task, &$headers, &$code, $timeout_ms = 0): string { }
 function pagelet_server_flush() { }
 function xbox_send_message($msg, &$ret, $timeout_ms, $host = "localhost") { }
 function xbox_post_message($msg, $host = "localhost") { }
diff --git a/hphp/hack/hhi/stdlib/builtins_string.idl.hhi b/hphp/hack/hhi/stdlib/builtins_string.idl.hhi
index 631507642d5..4f2b4a1af66 100644
--- a/hphp/hack/hhi/stdlib/builtins_string.idl.hhi
+++ b/hphp/hack/hhi/stdlib/builtins_string.idl.hhi
@@ -1,4 +1,4 @@
-<?hh     /* -*- php -*- */
+<?hh // decl    /* -*- php -*- */
 /**
  * Copyright (c) 2014, Facebook, Inc.
  * All rights reserved.
@@ -23,9 +23,9 @@ function strtoupper($str) { }
 function ucfirst($str) { }
 function lcfirst($str) { }
 function ucwords($str) { }
-function trim($str, $charlist = HPHP_TRIM_CHARLIST) { }
-function ltrim($str, $charlist = HPHP_TRIM_CHARLIST) { }
-function rtrim($str, $charlist = HPHP_TRIM_CHARLIST) { }
+function trim($str, $charlist = HPHP_TRIM_CHARLIST): string { }
+function ltrim($str, $charlist = HPHP_TRIM_CHARLIST): string { }
+function rtrim($str, $charlist = HPHP_TRIM_CHARLIST): string { }
 function chop($str, $charlist = HPHP_TRIM_CHARLIST) { }
 function explode($delimiter, $str, $limit = 0x7FFFFFFF) { }
 function join($glue, $pieces = null_variant) { }
diff --git a/hphp/hack/hhi/stdlib/builtins_url.idl.hhi b/hphp/hack/hhi/stdlib/builtins_url.idl.hhi
index 4accb7444b9..1e539adaf06 100644
--- a/hphp/hack/hhi/stdlib/builtins_url.idl.hhi
+++ b/hphp/hack/hhi/stdlib/builtins_url.idl.hhi
@@ -1,4 +1,4 @@
-<?hh     /* -*- php -*- */
+<?hh // decl    /* -*- php -*- */
 /**
  * Copyright (c) 2014, Facebook, Inc.
  * All rights reserved.
@@ -12,7 +12,7 @@ function base64_decode($data, $strict = false) { }
 function base64_encode($data) { }
 function get_headers($url, $format = 0) { }
 function get_meta_tags($filename, $use_include_path = false) { }
-function http_build_query($formdata, $numeric_prefix = null, $arg_separator = null) { }
+function http_build_query($formdata, $numeric_prefix = null, $arg_separator = null): string { }
 function parse_url($url, $component = -1) { }
 function rawurldecode($str) { }
 function rawurlencode($str) { }
diff --git a/hphp/hack/hhi/stdlib/bultins_filter.hhi b/hphp/hack/hhi/stdlib/bultins_filter.hhi
new file mode 100644
index 00000000000..969518b1162
--- /dev/null
+++ b/hphp/hack/hhi/stdlib/bultins_filter.hhi
@@ -0,0 +1,73 @@
+<?hh // decl   /* -*- php -*- */
+/**
+* Copyright (c) 2014, Facebook, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the BSD-style license found in the
+* LICENSE file in the 'hack' directory of this source tree. An additional grant
+* of patent rights can be found in the PATENTS file in the same directory.
+*
+*/
+const int INPUT_POST = 0;
+const int INPUT_GET = 0;
+const int INPUT_COOKIE = 0;
+const int INPUT_ENV = 0;
+const int INPUT_SERVER = 0;
+const int INPUT_SESSION = 0;
+const int INPUT_REQUEST = 0;
+const int FILTER_FLAG_NONE = 0;
+const int FILTER_REQUIRE_SCALAR = 0;
+const int FILTER_REQUIRE_ARRAY = 0;
+const int FILTER_FORCE_ARRAY = 0;
+const int FILTER_NULL_ON_FAILURE = 0;
+const int FILTER_VALIDATE_INT = 0;
+const int FILTER_VALIDATE_BOOLEAN = 0;
+const int FILTER_VALIDATE_FLOAT = 0;
+const int FILTER_VALIDATE_REGEXP = 0;
+const int FILTER_VALIDATE_URL = 0;
+const int FILTER_VALIDATE_EMAIL = 0;
+const int FILTER_VALIDATE_IP = 0;
+const int FILTER_VALIDATE_MAC = 0;
+const int FILTER_DEFAULT = 0;
+const int FILTER_UNSAFE_RAW = 0;
+const int FILTER_SANITIZE_STRING = 0;
+const int FILTER_SANITIZE_STRIPPED = 0;
+const int FILTER_SANITIZE_ENCODED = 0;
+const int FILTER_SANITIZE_SPECIAL_CHARS = 0;
+const int FILTER_SANITIZE_FULL_SPECIAL_CHARS = 0;
+const int FILTER_SANITIZE_EMAIL = 0;
+const int FILTER_SANITIZE_URL = 0;
+const int FILTER_SANITIZE_NUMBER_INT = 0;
+const int FILTER_SANITIZE_NUMBER_FLOAT = 0;
+const int FILTER_SANITIZE_MAGIC_QUOTES = 0;
+const int FILTER_CALLBACK = 0;
+const int FILTER_FLAG_ALLOW_OCTAL = 0;
+const int FILTER_FLAG_ALLOW_HEX = 0;
+const int FILTER_FLAG_STRIP_LOW = 0;
+const int FILTER_FLAG_STRIP_HIGH = 0;
+const int FILTER_FLAG_ENCODE_LOW = 0;
+const int FILTER_FLAG_ENCODE_HIGH = 0;
+const int FILTER_FLAG_ENCODE_AMP = 0;
+const int FILTER_FLAG_NO_ENCODE_QUOTES = 0;
+const int FILTER_FLAG_EMPTY_STRING_NULL = 0;
+const int FILTER_FLAG_STRIP_BACKTICK = 0;
+const int FILTER_FLAG_ALLOW_FRACTION = 0;
+const int FILTER_FLAG_ALLOW_THOUSAND = 0;
+const int FILTER_FLAG_ALLOW_SCIENTIFIC = 0;
+const int FILTER_FLAG_SCHEME_REQUIRED = 0;
+const int FILTER_FLAG_HOST_REQUIRED = 0;
+const int FILTER_FLAG_PATH_REQUIRED = 0;
+const int FILTER_FLAG_QUERY_REQUIRED = 0;
+const int FILTER_FLAG_IPV4 = 0;
+const int FILTER_FLAG_IPV6 = 0;
+const int FILTER_FLAG_NO_RES_RANGE = 0;
+const int FILTER_FLAG_NO_PRIV_RANGE = 0;
+
+function filter_has_var(int $type, string $variable_name): bool {}
+function filter_id(string $name): mixed {}
+function filter_input_array(int $type, mixed $defintion, bool $add_empty): mixed {}
+function filter_input(int $type, string $variable_name, int $filter = FILTER_DEFAULT, mixed $options = null): mixed {}
+function filter_list(): array<string> {}
+function filter_var_array(array $data, mixed $definition = null, bool $allow_empty = true): mixed {}
+function filter_var(mixed $value, int $filter = FILTER_DEFAULT, mixed $options = null): mixed {}
+
-- 
2.11.4.GIT