Mar 20, 2020 · Mar 20, 2020 · Mar 20, 2020 · Mar 20, 2020
diff --git a/extension.neon b/extension.neon
diff --git a/src/Type/PHPUnit/Assert/AssertMethodTypeSpecifyingExtension.php b/src/Type/PHPUnit/Assert/AssertMethodTypeSpecifyingExtension.php
diff --git a/src/Type/PHPUnit/Assert/AssertStaticMethodTypeSpecifyingExtension.php b/src/Type/PHPUnit/Assert/AssertStaticMethodTypeSpecifyingExtension.php
diff --git a/tests/Rules/PHPUnit/AssertSameMethodDifferentTypesRuleTest.php b/tests/Rules/PHPUnit/AssertSameMethodDifferentTypesRuleTest.php
diff --git a/tests/Rules/PHPUnit/AssertSameStaticMethodDifferentTypesRuleTest.php b/tests/Rules/PHPUnit/AssertSameStaticMethodDifferentTypesRuleTest.php
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,10 +20,14 @@ services:
		- phpstan.typeSpecifier.functionTypeSpecifyingExtension
		-
		class: PHPStan\Type\PHPUnit\Assert\AssertMethodTypeSpecifyingExtension
	arguments:
	classWithAssertionMethods: PHPUnit\Framework\TestCase
Copy link Author @Slamdunk Slamdunk Mar 20, 2020 • edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. I've retained the class used in https://github.com/phpstan/phpstan-phpunit/pull/65/files#diff-afc1ebcbfd95543266d01a244f0e43deL27, but shouldn't this be `PHPUnit\Framework\Assert` too? nreynis reacted with thumbs up emoji
		tags:
		- phpstan.typeSpecifier.methodTypeSpecifyingExtension
		-
		class: PHPStan\Type\PHPUnit\Assert\AssertStaticMethodTypeSpecifyingExtension
	arguments:
	classWithAssertionMethods: PHPUnit\Framework\Assert
		tags:
		- phpstan.typeSpecifier.staticMethodTypeSpecifyingExtension
		-
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,17 +14,28 @@
		class AssertMethodTypeSpecifyingExtension implements MethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
		{

	/** @var class-string */
	private $classWithAssertionMethods;

		/** @var TypeSpecifier */
		private $typeSpecifier;

	/**
	* @param class-string $classWithAssertionMethods
	*/
	public function __construct(string $classWithAssertionMethods)
	{
	$this->classWithAssertionMethods = $classWithAssertionMethods;
	}

		public function setTypeSpecifier(TypeSpecifier $typeSpecifier): void
		{
		$this->typeSpecifier = $typeSpecifier;
		}

		public function getClass(): string
		{
	return 'PHPUnit\Framework\TestCase';
	return $this->classWithAssertionMethods;
		}

		public function isMethodSupported(
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,17 +14,28 @@
		class AssertStaticMethodTypeSpecifyingExtension implements StaticMethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
		{

	/** @var class-string */
	private $classWithAssertionMethods;

		/** @var TypeSpecifier */
		private $typeSpecifier;

	/**
	* @param class-string $classWithAssertionMethods
	*/
	public function __construct(string $classWithAssertionMethods)
	{
	$this->classWithAssertionMethods = $classWithAssertionMethods;
	}

		public function setTypeSpecifier(TypeSpecifier $typeSpecifier): void
		{
		$this->typeSpecifier = $typeSpecifier;
		}

		public function getClass(): string
		{
	return 'PHPUnit\Framework\Assert';
	return $this->classWithAssertionMethods;
		}

		public function isStaticMethodSupported(
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,7 +24,7 @@ protected function getRule(): Rule
		protected function getMethodTypeSpecifyingExtensions(): array
		{
		return [
	new AssertMethodTypeSpecifyingExtension(),
	new AssertMethodTypeSpecifyingExtension('PHPUnit\Framework\TestCase'),
		];
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,7 +24,7 @@ protected function getRule(): Rule
		protected function getStaticMethodTypeSpecifyingExtensions(): array
		{
		return [
	new AssertStaticMethodTypeSpecifyingExtension(),
	new AssertStaticMethodTypeSpecifyingExtension('PHPUnit\Framework\Assert'),
		];
		}

Expand Down