Fix some hhvm 4.34 BC breaks (#11)

hhvm 4.34 compatibility

Author: lexidor

.gitignore

@@ -1,2 +1,3 @@
 vendor
 composer.lock
+**/*hhast.parser-cache

.hhconfig

@@ -1,5 +1,39 @@
-disallow_elvis_space=true
-disallow_non_arraykey_keys=true
-disallow_unsafe_comparisons=true
-decl_override_require_hint=true
-enable_experimental_tc_features=shape_field_check,sealed_classes
+assume_php = false
+check_attribute_locations = true
+check_xhp_attribute = true
+const_default_func_args = true
+decl_override_require_hint = true
+disable_halt_compiler = true
+disable_instanceof_refinement = true
+disable_legacy_soft_typehints = true
+disable_lval_as_an_expression = true
+disable_partially_abstract_typeconsts = true
+disable_primitive_refinement = true
+disable_static_closures = true
+disable_static_local_variables = true
+disable_unsafe_block = true
+disable_unsafe_expr = true
+disable_unset_class_const = true
+disallow_ambiguous_lambda = true
+disallow_array_literal = true
+disallow_byref_calls = true
+disallow_byref_dynamic_calls = true
+disallow_destruct = true
+disallow_elvis_space = true
+disallow_func_ptrs_in_constants = true
+disallow_invalid_arraykey = true
+disallow_invalid_arraykey_constraint = true
+disallow_non_arraykey_keys = true
+disallow_scrutinee_case_value_type_mismatch = true
+disallow_silence = true
+disallow_stringish_magic = true
+disallow_toplevel_requires = true
+disallow_unsafe_comparisons = true
+disallowed_decl_fixmes = 2049, 2050, 4002, 4041, 4049, 4050, 4052, 4055, 4057, 4068, 4077, 4080, 4085, 4086, 4090, 4104, 4105, 4106, 4300, 4337, 4352, 4366
+error_php_lambdas = true
+ignored_fixme_codes = 1001, 1002, 1003, 1004, 1005, 1006, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2023, 2024, 2027, 2028, 2029, 2030, 2031, 2032, 2033, 2034, 2036, 2037, 2038, 2039, 2040, 2041, 2042, 2044, 2045, 2046, 2047, 2048, 2051, 2052, 2054, 2055, 2056, 2057, 2058, 2059, 2060, 2062, 2063, 2064, 2065, 2066, 2067, 2068, 2069, 2070, 2072, 2073, 2074, 2075, 2076, 2077, 2078, 2079, 2080, 2081, 2082, 2083, 2084, 2085, 2086, 2087, 2088, 2089, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099, 2100, 2101, 2102, 2103, 2104, 2105, 2106, 2107, 2108, 2109, 3001, 3002, 3003, 3005, 3006, 3008, 3009, 3010, 3012, 3013, 3014, 3015, 3016, 3017, 3018, 3019, 3020, 3021, 3022, 3023, 3024, 3025, 3026, 3027, 3028, 3029, 3030, 3031, 3032, 3033, 3034, 3035, 3036, 3037, 3038, 3039, 3040, 3042, 3043, 3044, 3045, 3046, 3047, 3048, 3049, 3050, 3051, 3052, 3053, 3054, 3055, 3056, 3057, 3058, 3059, 3060, 3061, 3062, 3063, 3064, 3065, 3066, 3067, 3068, 3069, 3070, 3071, 3072, 3073, 3074, 3075, 3076, 3077, 3078, 3079, 3080, 3081, 3082, 3083, 4002, 4008, 4012, 4014, 4020, 4024, 4033, 4034, 4035, 4039, 4042, 4043, 4049, 4050, 4052, 4055, 4067, 4068, 4070, 4077, 4080, 4083, 4085, 4086, 4089, 4121, 4131, 4133, 4143, 4152, 4154, 4166, 4168, 4175, 4181, 4182, 4183, 4190, 4191, 4192, 4194, 4223, 4225, 4231, 4239, 4250, 4253, 4267, 4275, 4296, 4299, 4315, 4321, 4328, 4330, 4331, 4332, 4336, 4353
+new_inference_lambda = true
+safe_array = true
+safe_vector_array = true
+typecheck_xhp_cvars = true
+unsafe_rx = false

composer.json

@@ -24,7 +24,7 @@
         "hhvm/hsl": "^4.1",
         "hhvm/type-assert": "^3.2",
         "facebook/fbexpect": "^2.3",
-        "hhvm/hacktest": "^1.4"
+        "hhvm/hacktest": "^1.4|^2.0"
     },
     "require-dev": {
         "hhvm/hhast": "^4.1"

src/Expectation.hh

@@ -94,7 +94,7 @@ final class Expectation implements ExpectationInterface {
 			$param_expectation = $this->parameters[$key];
 			if (\is_callable($param_expectation)) {
 				invariant(
-					\call_user_func($param_expectation, $param),
+					\call_user_func($param_expectation as dynamic, $param),
 					'Parameter validation failed'
 				);
 			} else {

src/Mock.hh

@@ -19,7 +19,7 @@ final class Mock<TC> implements MockInterface {
 
 		/* HH_FIXME[2049] **/
 		/* HH_FIXME[4107] **/
-		eval(
+		\eval(
 			(new Mock\MockBuilder($rfl))
 			->setName($mock_name)
 			->get()

src/Mock/MockBuilder.hh

@@ -2,9 +2,7 @@
 
 namespace Usox\HackMock\Mock;
 
-use type Facebook\HackCodegen\CodegenClass;
-use type Facebook\HackCodegen\HackCodegenFactory;
-use type Facebook\HackCodegen\HackCodegenConfig;
+use type Facebook\HackCodegen\{CodegenClass, HackCodegenConfig, HackCodegenFactory};
 use namespace HH\Lib\Str;
 
 final class MockBuilder {
@@ -53,7 +51,7 @@ final class MockBuilder {
 				->setReturnType('mixed')
 				->setIsStatic($method->isStatic());
 
-			$param_list = [];
+			$param_list = varray[];
 
 			foreach ($method->getParameters() as $param) {
 				foreach ($this->param_generators as $generator) {

src/functions.hh

@@ -54,7 +54,7 @@ function process_expectation(
 		);
 	}
 
-	foreach ($expectations as $key => $expectation) {
+	foreach ($expectations as $expectation) {
 		try {
 			if ($expectation->isActive() === false) {
 				continue;