Commit c2975d7

committed

Make assertion types class a parameter

1 parent 783a04d commit c2975d7Copy full SHA for c2975d7

File tree

+30

-4

lines changed

+30

-4

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,14 @@ services:`
`20`	`20`	`- phpstan.typeSpecifier.functionTypeSpecifyingExtension`
`21`	`21`	`-`
`22`	`22`	`class: PHPStan\Type\PHPUnit\Assert\AssertMethodTypeSpecifyingExtension`
	`23`	`+ arguments:`
	`24`	`+ classWithAssertionMethods: PHPUnit\Framework\TestCase`
`23`	`25`	`tags:`
`24`	`26`	`- phpstan.typeSpecifier.methodTypeSpecifyingExtension`
`25`	`27`	`-`
`26`	`28`	`class: PHPStan\Type\PHPUnit\Assert\AssertStaticMethodTypeSpecifyingExtension`
	`29`	`+ arguments:`
	`30`	`+ classWithAssertionMethods: PHPUnit\Framework\Assert`
`27`	`31`	`tags:`
`28`	`32`	`- phpstan.typeSpecifier.staticMethodTypeSpecifyingExtension`
`29`	`33`	`-`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,17 +14,28 @@`
`14`	`14`	`class AssertMethodTypeSpecifyingExtension implements MethodTypeSpecifyingExtension, TypeSpecifierAwareExtension`
`15`	`15`	`{`
`16`	`16`
	`17`	`+ /** @var class-string */`
	`18`	`+ private $classWithAssertionMethods;`
	`19`	`+`
`17`	`20`	`/** @var TypeSpecifier */`
`18`	`21`	`private $typeSpecifier;`
`19`	`22`
	`23`	`+ /**`
	`24`	`+ * @param class-string $classWithAssertionMethods`
	`25`	`+ */`
	`26`	`+ public function __construct(string $classWithAssertionMethods)`
	`27`	`+ {`
	`28`	`+ $this->classWithAssertionMethods = $classWithAssertionMethods;`
	`29`	`+ }`
	`30`	`+`
`20`	`31`	`public function setTypeSpecifier(TypeSpecifier $typeSpecifier): void`
`21`	`32`	`{`
`22`	`33`	`$this->typeSpecifier = $typeSpecifier;`
`23`	`34`	`}`
`24`	`35`
`25`	`36`	`public function getClass(): string`
`26`	`37`	`{`
`27`		`- return 'PHPUnit\Framework\TestCase';`
	`38`	`+ return $this->classWithAssertionMethods;`
`28`	`39`	`}`
`29`	`40`
`30`	`41`	`public function isMethodSupported(`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,17 +14,28 @@`
`14`	`14`	`class AssertStaticMethodTypeSpecifyingExtension implements StaticMethodTypeSpecifyingExtension, TypeSpecifierAwareExtension`
`15`	`15`	`{`
`16`	`16`
	`17`	`+ /** @var class-string */`
	`18`	`+ private $classWithAssertionMethods;`
	`19`	`+`
`17`	`20`	`/** @var TypeSpecifier */`
`18`	`21`	`private $typeSpecifier;`
`19`	`22`
	`23`	`+ /**`
	`24`	`+ * @param class-string $classWithAssertionMethods`
	`25`	`+ */`
	`26`	`+ public function __construct(string $classWithAssertionMethods)`
	`27`	`+ {`
	`28`	`+ $this->classWithAssertionMethods = $classWithAssertionMethods;`
	`29`	`+ }`
	`30`	`+`
`20`	`31`	`public function setTypeSpecifier(TypeSpecifier $typeSpecifier): void`
`21`	`32`	`{`
`22`	`33`	`$this->typeSpecifier = $typeSpecifier;`
`23`	`34`	`}`
`24`	`35`
`25`	`36`	`public function getClass(): string`
`26`	`37`	`{`
`27`		`- return 'PHPUnit\Framework\Assert';`
	`38`	`+ return $this->classWithAssertionMethods;`
`28`	`39`	`}`
`29`	`40`
`30`	`41`	`public function isStaticMethodSupported(`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ protected function getRule(): Rule`
`24`	`24`	`protected function getMethodTypeSpecifyingExtensions(): array`
`25`	`25`	`{`
`26`	`26`	`return [`
`27`		`- new AssertMethodTypeSpecifyingExtension(),`
	`27`	`+ new AssertMethodTypeSpecifyingExtension('PHPUnit\Framework\TestCase'),`
`28`	`28`	`];`
`29`	`29`	`}`
`30`	`30`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ protected function getRule(): Rule`
`24`	`24`	`protected function getStaticMethodTypeSpecifyingExtensions(): array`
`25`	`25`	`{`
`26`	`26`	`return [`
`27`		`- new AssertStaticMethodTypeSpecifyingExtension(),`
	`27`	`+ new AssertStaticMethodTypeSpecifyingExtension('PHPUnit\Framework\Assert'),`
`28`	`28`	`];`
`29`	`29`	`}`
`30`	`30`

Comments

(0)