Better support for mocking concrete implementations and nullable params

Author: usox

src/HackMock.hh

@@ -2,11 +2,12 @@
 
 namespace Usox\HackMock;
 
-use Facebook\HackTest\HackTest;
+use type Facebook\HackTest\HackTest;
 
 abstract class HackMock extends HackTest {
 
+	<<__Override>>
 	public async function afterEachTestAsync(): Awaitable<void> {
 		\Usox\HackMock\tear_down();
 	}
-}
+}

src/Mock.hh

@@ -37,10 +37,20 @@ final class Mock<TC> implements MockInterface {
 		foreach ($rfl->getMethods() as $method) {
 			$method_name = $method->getName();
 
+			if ($method_name === '__construct') {
+				$gen_method = $this
+					->code_generator
+					->codegenMethod($method_name)
+					->setReturnType('void');
+				$class->addMethod($gen_method);
+				continue;
+			}
+
 			$gen_method = $this
 				->code_generator
 				->codegenMethod($method_name)
 				->setReturnType('mixed')
+				->setIsStatic($method->isStatic())
 				->setBodyf(
 					'return \Usox\HackMock\process_expectation(__CLASS__, \'%s\', vec(func_get_args()));',
 					$method_name
@@ -64,19 +74,37 @@ final class Mock<TC> implements MockInterface {
 								$parameter->getDefaultValue()
 							);
 						} else {
+							$default_value = $parameter->getDefaultValue();
+							$nullable = '';
+							if (is_array($default_value)) {
+								$default_value = '[]';
+							}
+							if ($parameter->allowsNull()) {
+								$nullable = '?';
+							}
 							$gen_method->addParameterf(
-								'%s $%s = %s',
+								'%s%s $%s = %s',
 								(string) $parameter->getType(),
+								$nullable,
 								$parameter->getName(),
-								$parameter->getDefaultValue()
+								$default_value
 							);
 						}
 					}
 				} else {
+					$nullable = '';
+					$default = '';
+					$type = Str\trim((string) $parameter->getType());
+					if ($parameter->allowsNull()) {
+						$nullable = '?';
+						$default = ' = null';
+					}
 					$gen_method->addParameterf(
-						'%s $%s',
-						$parameter->getTypehintText(),
+						'%s%s $%s%s',
+						$nullable,
+						$type,
 						$parameter->getName(),
+						$default
 					);
 				}
 			}

tests/SampleBaseClass.hh

@@ -1,6 +1,10 @@
 <?hh // strict
 
 class SampleBaseClass {
+
+	public function __construct(): void {
+		throw new \Exception('Should never be thrown');
+	}
 
 	public function noParamsAndVoid(): void {
 
@@ -10,4 +14,10 @@ class SampleBaseClass {
 		return $some_int;
 	}
 
+	public function intOrNullWithDefault(?int $some_int = null): void {
+	}
+
+	public static function someStaticFunction(): void {
+
+	}
 }

tests/SampleTest.hh

@@ -262,4 +262,14 @@ class SampleTest extends \Usox\HackMock\HackMock {
 		)
 		->toBeSame($int2);
 	}
+
+	public function testIntOrNullWithDefaultOnBaseClass(): void {
+		$sample = mock(SampleBaseClass::class);
+
+		prospect($sample, 'intOrNullWithDefault')
+			->with(55)
+			->once();
+
+		$sample->intOrNullWithDefault(55);
+	}
 }