Commit 223997e3 authored by Simon Welsh's avatar Simon Welsh

Merge branch 'phpunit-5.2' of git.simon.geek.nz:91-carriage/phpunit-hhi into phpunit-5.2

parents 9424ada6 9760d303
......@@ -203,7 +203,7 @@ abstract class PHPUnit_Framework_Assert {
bool $canonicalize = false,
bool $ignoreCase = false,
): void;
public function assertFalse(bool $condition, string $message = ''): void;
public function assertFalse(mixed $condition, string $message = ''): void;
public function assertFileEquals(
string $expected,
string $actual,
......@@ -422,12 +422,12 @@ abstract class PHPUnit_Framework_Assert {
string $string,
string $message = '',
): void;
public function assertThat(
public function assertThat<T>(
mixed $value,
PHPUnit_Framework_Constraint $constraint,
PHPUnit_Framework_Constraint<T> $constraint,
string $message = '',
): void;
public function assertTrue(bool $conditions, string $message = ''): void;
public function assertTrue(mixed $conditions, string $message = ''): void;
public function assertXmlFileEqualsXmlFile(
string $expected,
string $actual,
......@@ -469,37 +469,41 @@ abstract class PHPUnit_Framework_Assert {
public function arrayHasKey(
arraykey $key,
): PHPUnit_Framework_Constraint_ArrayHasKey;
public function attribute(
PHPUnit_Framework_Constraint $constraint,
public function attribute<T>(
PHPUnit_Framework_Constraint<T> $constraint,
string $attributeName,
): PHPUnit_Framework_Constraint_Attribute;
public function attributeEqualTo(
): PHPUnit_Framework_Constraint_Attribute<T>;
public function attributeEqualTo<T>(
string $attributeName,
mixed $value,
float $delta = 0.0,
int $maxDepth = 10,
bool $canonicalize = false,
bool $ignoreCase = false,
): PHPUnit_Framework_Constraint_Attribute;
public function callback($callback): PHPUnit_Framework_Constraint_Callback;
public function classHasAttribute(
): PHPUnit_Framework_Constraint_Attribute<T>;
public function callback<T>(
(function(T): bool) $callback,
): PHPUnit_Framework_Constraint_Callback<T>;
public function classHasAttribute<T>(
string $attributeName,
): PHPUnit_Framework_Constraint_ClassHasAttribute;
public function classHasStaticAttribute(
): PHPUnit_Framework_Constraint_ClassHasAttribute<T>;
public function classHasStaticAttribute<T>(
string $attributeName,
): PHPUnit_Framework_Constraint_ClassHasStaticAttribute;
public function contains(
): PHPUnit_Framework_Constraint_ClassHasStaticAttribute<T>;
public function contains<T>(
mixed $value,
bool $checkForObjectIdentity = true,
bool $checkForNonObjectIdentity = false,
): PHPUnit_Framework_Constraint_TraversableContains;
public function containsOnly(
): PHPUnit_Framework_Constraint_TraversableContains<T>;
public function containsOnly<T>(
string $type,
): PHPUnit_Framework_Constraint_TraversableContainsOnly;
): PHPUnit_Framework_Constraint_TraversableContainsOnly<T>;
public function containsOnlyInstancesOf<T>(
classname<T> $className,
): PHPUnit_Framework_Constraint_TraversableContainsOnly;
public function countOf(int $count): PHPUnit_Framework_Constraint_Count;
): PHPUnit_Framework_Constraint_TraversableContainsOnly<classname<T>>;
public function countOf<T>(
int $count,
): PHPUnit_Framework_Constraint_Count<T>;
public function equalTo(
mixed $value,
float $delta = 0.0,
......@@ -511,7 +515,9 @@ abstract class PHPUnit_Framework_Assert {
public function greaterThan(
$value,
): PHPUnit_Framework_Constraint_GreaterThan;
public function greaterThanOrEqual($value): PHPUnit_Framework_Constraint_Or;
public function greaterThanOrEqual(
$value,
): PHPUnit_Framework_Constraint_Or<num>;
public function identicalTo(
$value,
): PHPUnit_Framework_Constraint_IsIdentical;
......@@ -521,29 +527,37 @@ abstract class PHPUnit_Framework_Assert {
public function isInfinite(): PHPUnit_Framework_Constraint_IsInfinite;
public function isInstanceOf<T>(
classname<T> $className,
): PHPUnit_Framework_Constraint_IsInstanceOf;
): PHPUnit_Framework_Constraint_IsInstanceOf<T>;
public function isJson(): PHPUnit_Framework_Constraint_IsJson;
public function isNan(): PHPUnit_Framework_Constraint_IsNan;
public function isNull(): PHPUnit_Framework_Constraint_IsNull;
public function isTrue(): PHPUnit_Framework_Constraint_IsTrue;
public function isType(string $type): PHPUnit_Framework_Constraint_IsType;
public function lessThan($value): PHPUnit_Framework_Constraint_LessThan;
public function lessThanOrEqual($value): PHPUnit_Framework_Constraint_Or;
public function logicalAnd(...): PHPUnit_Framework_Constraint_And;
public function logicalNot(
PHPUnit_Framework_Constraint $constraint,
): PHPUnit_Framework_Constraint_Not;
public function logicalOr(...): PHPUnit_Framework_Constraint_Or;
public function logicalXor(...): PHPUnit_Framework_Constraint_Xor;
public function lessThanOrEqual(
$value,
): PHPUnit_Framework_Constraint_Or<num>;
public function logicalAnd<T>(
PHPUnit_Framework_Constraint<T> ...$constraints
): PHPUnit_Framework_Constraint_And<T>;
public function logicalNot<T>(
PHPUnit_Framework_Constraint<T> $constraint,
): PHPUnit_Framework_Constraint_Not<T>;
public function logicalOr<T>(
PHPUnit_Framework_Constraint<T> ...$constraints
): PHPUnit_Framework_Constraint_Or<T>;
public function logicalXor<T>(
PHPUnit_Framework_Constraint<T> ...$constraints
): PHPUnit_Framework_Constraint_Xor<T>;
public function matches(
string $string,
): PHPUnit_Framework_Constraint_StringMatches;
public function matchesRegularExpression(
string $pattern,
): PHPUnit_Framework_Constraint_PCREMatch;
public function objectHasAttribute(
public function objectHasAttribute<T>(
string $attributeName,
): PHPUnit_Framework_Constraint_ObjectHasAttribute;
): PHPUnit_Framework_Constraint_ObjectHasAttribute<T>;
public function stringContains(
string $string,
bool $case = true,
......@@ -567,4 +581,4 @@ abstract class PHPUnit_Framework_Assert {
public static function getCount(): int;
public static function resetCount(): void;
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment