mirror of
https://github.com/danog/psalm-plugin-phpunit.git
synced 2024-12-03 09:57:52 +01:00
Merge pull request #11 from SignpostMarv/fix/void-is-reserved-word
Fix/void is reserved word
This commit is contained in:
commit
707b2472ba
@ -1,6 +1,10 @@
|
|||||||
language: php
|
language: php
|
||||||
php:
|
php:
|
||||||
|
- 7.0
|
||||||
|
- 7.1
|
||||||
|
- 7.2
|
||||||
- 7.3
|
- 7.3
|
||||||
|
- 7.4snapshot
|
||||||
before_install:
|
before_install:
|
||||||
- phpenv config-rm xdebug.ini || true
|
- phpenv config-rm xdebug.ini || true
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
"require-dev": {
|
"require-dev": {
|
||||||
"squizlabs/php_codesniffer": "^3.3.1",
|
"squizlabs/php_codesniffer": "^3.3.1",
|
||||||
"codeception/base": "^2.5",
|
"codeception/base": "^2.5",
|
||||||
"weirdan/codeception-psalm-module": "dev-master"
|
"weirdan/codeception-psalm-module": "^0.1.0"
|
||||||
},
|
},
|
||||||
"extra": {
|
"extra": {
|
||||||
"psalm": {
|
"psalm": {
|
||||||
|
@ -91,7 +91,7 @@ abstract class Assert
|
|||||||
* @psalm-assert !null $actual
|
* @psalm-assert !null $actual
|
||||||
*/
|
*/
|
||||||
public static function assertNotNull($actual, $message = '') {}
|
public static function assertNotNull($actual, $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Asserts that two variables are the same.
|
* Asserts that two variables are the same.
|
||||||
*
|
*
|
||||||
@ -100,9 +100,10 @@ abstract class Assert
|
|||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @param string $message
|
* @param string $message
|
||||||
* @psalm-assert =T $actual
|
* @psalm-assert =T $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
function assertSame($expected, $actual, $message = '') : void {}
|
function assertSame($expected, $actual, $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Asserts that two variables are not the same.
|
* Asserts that two variables are not the same.
|
||||||
*
|
*
|
||||||
@ -111,6 +112,7 @@ abstract class Assert
|
|||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @param string $message
|
* @param string $message
|
||||||
* @psalm-assert !=T $actual
|
* @psalm-assert !=T $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
function assertNotSame($expected, $actual, $message = '') : void {}
|
function assertNotSame($expected, $actual, $message = '') {}
|
||||||
}
|
}
|
||||||
|
@ -6,133 +6,155 @@ abstract class Assert
|
|||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert array $actual
|
* @psalm-assert array $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsArray($actual, string $message = ''): void {}
|
public static function assertIsArray($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert bool $actual
|
* @psalm-assert bool $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsBool($actual, string $message = ''): void {}
|
public static function assertIsBool($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert float $actual
|
* @psalm-assert float $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsFloat($actual, string $message = ''): void {}
|
public static function assertIsFloat($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert int $actual
|
* @psalm-assert int $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsInt($actual, string $message = ''): void {}
|
public static function assertIsInt($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert numeric $actual
|
* @psalm-assert numeric $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsNumeric($actual, string $message = ''): void {}
|
public static function assertIsNumeric($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert object $actual
|
* @psalm-assert object $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsObject($actual, string $message = ''): void {}
|
public static function assertIsObject($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert resource $actual
|
* @psalm-assert resource $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsResource($actual, string $message = ''): void {}
|
public static function assertIsResource($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert string $actual
|
* @psalm-assert string $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsString($actual, string $message = ''): void {}
|
public static function assertIsString($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert scalar $actual
|
* @psalm-assert scalar $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsScalar($actual, string $message = ''): void {}
|
public static function assertIsScalar($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert callable $actual
|
* @psalm-assert callable $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsCallable($actual, string $message = ''): void {}
|
public static function assertIsCallable($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert iterable $actual
|
* @psalm-assert iterable $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsIterable($actual, string $message = ''): void {}
|
public static function assertIsIterable($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert !array $actual
|
* @psalm-assert !array $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsNotArray($actual, string $message = ''): void {}
|
public static function assertIsNotArray($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert !bool $actual
|
* @psalm-assert !bool $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsNotBool($actual, string $message = ''): void {}
|
public static function assertIsNotBool($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert !float $actual
|
* @psalm-assert !float $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsNotFloat($actual, string $message = ''): void {}
|
public static function assertIsNotFloat($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert !int $actual
|
* @psalm-assert !int $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsNotInt($actual, string $message = ''): void {}
|
public static function assertIsNotInt($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert !numeric $actual
|
* @psalm-assert !numeric $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsNotNumeric($actual, string $message = ''): void {}
|
public static function assertIsNotNumeric($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert !object $actual
|
* @psalm-assert !object $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsNotObject($actual, string $message = ''): void {}
|
public static function assertIsNotObject($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert !resource $actual
|
* @psalm-assert !resource $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsNotResource($actual, string $message = ''): void {}
|
public static function assertIsNotResource($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert !string $actual
|
* @psalm-assert !string $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsNotString($actual, string $message = ''): void {}
|
public static function assertIsNotString($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert !scalar $actual
|
* @psalm-assert !scalar $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsNotScalar($actual, string $message = ''): void {}
|
public static function assertIsNotScalar($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert !callable $actual
|
* @psalm-assert !callable $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsNotCallable($actual, string $message = ''): void {}
|
public static function assertIsNotCallable($actual, string $message = '') {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $actual
|
* @param mixed $actual
|
||||||
* @psalm-assert !iterable $actual
|
* @psalm-assert !iterable $actual
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function assertIsNotIterable($actual, string $message = ''): void {}
|
public static function assertIsNotIterable($actual, string $message = '') {}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -20,8 +20,10 @@ class Acceptance extends \Codeception\Module
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @Given /I have PHPUnit (newer than|older than) "([0-9.]+)" \(because of "([^"]+)"\)/
|
* @Given /I have PHPUnit (newer than|older than) "([0-9.]+)" \(because of "([^"]+)"\)/
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function havePHPUnitOfACertainVersionRangeBecauseOf(string $operator, string $version, string $reason): void
|
public function havePHPUnitOfACertainVersionRangeBecauseOf(string $operator, string $version, string $reason)
|
||||||
{
|
{
|
||||||
if (!isset(self::VERSION_OPERATORS[$operator])) {
|
if (!isset(self::VERSION_OPERATORS[$operator])) {
|
||||||
throw new TestRuntimeException("Unknown operator: $operator");
|
throw new TestRuntimeException("Unknown operator: $operator");
|
||||||
|
@ -18,7 +18,11 @@ Feature: Assert
|
|||||||
function f(): \Exception {
|
function f(): \Exception {
|
||||||
return rand(0,1) ? new \RuntimeException : new \InvalidArgumentException;
|
return rand(0,1) ? new \RuntimeException : new \InvalidArgumentException;
|
||||||
}
|
}
|
||||||
function acceptsRuntimeException(\RuntimeException $_e): void {}
|
|
||||||
|
/**
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
function acceptsRuntimeException(\RuntimeException $_e) {}
|
||||||
|
|
||||||
$e = f();
|
$e = f();
|
||||||
Assert::assertInstanceOf(\RuntimeException::class, $e);
|
Assert::assertInstanceOf(\RuntimeException::class, $e);
|
||||||
|
Loading…
Reference in New Issue
Block a user