Update dev dependencies (#254)

Support nikic/php-parser 5 and PHPUnit 11.
spaze · Mar 19, 2024 · bcd693f · bcd693f
2 parents d363d00 + e3f6e67
commit bcd693f
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -26,8 +26,8 @@
 	},
 	"require-dev": {
 		"nette/neon": "^3.2",
-		"nikic/php-parser": "^4.13",
-		"phpunit/phpunit": "^8.5 || ^10.1",
+		"nikic/php-parser": "^4.13 || ^5.0",
+		"phpunit/phpunit": "^8.5 || ^10.1 || ^11.0",
 		"php-parallel-lint/php-parallel-lint": "^1.2",
 		"php-parallel-lint/php-console-highlighter": "^1.0",
 		"spaze/coding-standard": "^1.7"

diff --git a/src/Allowed/Allowed.php b/src/Allowed/Allowed.php
@@ -14,6 +14,7 @@
 use PHPStan\Type\NullType;
 use PHPStan\Type\Type;
 use PHPStan\Type\UnionType;
+use PHPStan\Type\VerbosityLevel;
 use Spaze\PHPStan\Rules\Disallowed\DisallowedWithParams;
 use Spaze\PHPStan\Rules\Disallowed\Exceptions\UnsupportedParamTypeException;
 use Spaze\PHPStan\Rules\Disallowed\Exceptions\UnsupportedParamTypeInConfigException;
@@ -25,6 +26,7 @@
 use Spaze\PHPStan\Rules\Disallowed\Params\ParamValueCaseInsensitiveExcept;
 use Spaze\PHPStan\Rules\Disallowed\Params\ParamValueExcept;
 use Spaze\PHPStan\Rules\Disallowed\Params\ParamValueExceptAny;
+use Spaze\PHPStan\Rules\Disallowed\Params\ParamValueFlag;
 use Spaze\PHPStan\Rules\Disallowed\Params\ParamValueFlagExcept;
 use Spaze\PHPStan\Rules\Disallowed\Params\ParamValueFlagSpecific;
 use Spaze\PHPStan\Rules\Disallowed\Params\ParamValueSpecific;
@@ -302,6 +304,13 @@ private function paramFactory(string $class, $key, $value): ParamValue
 		} else {
 			throw new UnsupportedParamTypeInConfigException($paramPosition, $paramName, gettype($paramValue));
 		}
+		if (is_subclass_of($class, ParamValueFlag::class)) {
+			foreach ($type->getConstantScalarValues() as $value) {
+				if (!is_int($value)) {
+					throw new UnsupportedParamTypeInConfigException($paramPosition, $paramName, gettype($value) . ' of ' . $type->describe(VerbosityLevel::precise()));
+				}
+			}
+		}
 		return new $class($paramPosition, $paramName, $type);
 	}
 

diff --git a/src/Params/ParamValueFlag.php b/src/Params/ParamValueFlag.php
@@ -5,27 +5,21 @@
 
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Type;
-use PHPStan\Type\VerbosityLevel;
 use Spaze\PHPStan\Rules\Disallowed\Exceptions\UnsupportedParamTypeException;
-use Spaze\PHPStan\Rules\Disallowed\Exceptions\UnsupportedParamTypeInConfigException;
 
 abstract class ParamValueFlag extends ParamValue
 {
 
 	/**
 	 * @throws UnsupportedParamTypeException
-	 * @throws UnsupportedParamTypeInConfigException
 	 */
 	protected function isFlagSet(Type $type): bool
 	{
 		if (!$type instanceof ConstantIntegerType) {
 			throw new UnsupportedParamTypeException();
 		}
 		foreach ($this->getType()->getConstantScalarValues() as $value) {
-			if (!is_int($value)) {
-				throw new UnsupportedParamTypeInConfigException($this->getPosition(), $this->getName(), gettype($value) . ' of ' . $this->getType()->describe(VerbosityLevel::precise()));
-			}
-			if (($value & $type->getValue()) !== 0) {
+			if (is_int($value) && ($value & $type->getValue()) !== 0) {
 				return true;
 			}
 		}

diff --git a/tests/Allowed/AllowedPathTest.php b/tests/Allowed/AllowedPathTest.php
@@ -11,6 +11,7 @@
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Testing\PHPStanTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Spaze\PHPStan\Rules\Disallowed\File\FilePath;
 use Traits\TestClass;
 use Traits\TestTrait;
@@ -44,6 +45,7 @@ protected function setUp(): void
 	/**
 	 * @dataProvider pathProvider
 	 */
+	#[DataProvider('pathProvider')]
 	public function testMatches(string $allowedPath, string $file, string $fileWithRootDir): void
 	{
 		$context = ScopeContext::create($file);

diff --git a/tests/Calls/FunctionCallsNamedParamsTest.php b/tests/Calls/FunctionCallsNamedParamsTest.php
@@ -6,12 +6,14 @@
 use PHPStan\Rules\Rule;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Testing\RuleTestCase;
+use PHPUnit\Framework\Attributes\RequiresPhp;
 use Spaze\PHPStan\Rules\Disallowed\DisallowedCallFactory;
 use Spaze\PHPStan\Rules\Disallowed\RuleErrors\DisallowedCallsRuleErrors;
 
 /**
  * @requires PHP >= 8.0
  */
+#[RequiresPhp('>= 8.0')]
 class FunctionCallsNamedParamsTest extends RuleTestCase
 {
 

diff --git a/tests/Calls/FunctionCallsTypeStringParamsInvalidFlagsConfigTest.php b/tests/Calls/FunctionCallsTypeStringParamsInvalidFlagsConfigTest.php
@@ -3,23 +3,23 @@
 
 namespace Spaze\PHPStan\Rules\Disallowed\Calls;
 
-use PHPStan\Rules\Rule;
 use PHPStan\ShouldNotHappenException;
-use PHPStan\Testing\RuleTestCase;
+use PHPStan\Testing\PHPStanTestCase;
 use Spaze\PHPStan\Rules\Disallowed\DisallowedCallFactory;
-use Spaze\PHPStan\Rules\Disallowed\Exceptions\UnsupportedParamTypeInConfigException;
 use Spaze\PHPStan\Rules\Disallowed\RuleErrors\DisallowedCallsRuleErrors;
 
-class FunctionCallsTypeStringParamsInvalidFlagsConfigTest extends RuleTestCase
+class FunctionCallsTypeStringParamsInvalidFlagsConfigTest extends PHPStanTestCase
 {
 
 	/**
 	 * @throws ShouldNotHappenException
 	 */
-	protected function getRule(): Rule
+	public function testException(): void
 	{
+		$this->expectException(ShouldNotHappenException::class);
+		$this->expectExceptionMessage("Foo\Bar\Waldo\intParam1(): Parameter #1 has an unsupported type string of 2|'bruh' specified in configuration");
 		$container = self::getContainer();
-		return new FunctionCalls(
+		new FunctionCalls(
 			$container->getByType(DisallowedCallsRuleErrors::class),
 			$container->getByType(DisallowedCallFactory::class),
 			$this->createReflectionProvider(),
@@ -38,14 +38,6 @@ protected function getRule(): Rule
 	}
 
 
-	public function testException(): void
-	{
-		$this->expectException(UnsupportedParamTypeInConfigException::class);
-		$this->expectExceptionMessage("Parameter #1 has an unsupported type string of 2|'bruh' specified in configuration");
-		$this->analyse([__DIR__ . '/../src/disallowed/functionCallsTypeStringParams.php'], []);
-	}
-
-
 	public static function getAdditionalConfigFiles(): array
 	{
 		return [

diff --git a/tests/DisallowedSuperglobalFactoryTest.php b/tests/DisallowedSuperglobalFactoryTest.php
@@ -6,6 +6,7 @@
 use Generator;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Testing\PHPStanTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class DisallowedSuperglobalFactoryTest extends PHPStanTestCase
 {
@@ -16,6 +17,7 @@ class DisallowedSuperglobalFactoryTest extends PHPStanTestCase
 	 * @param class-string|null $exceptionClass
 	 * @throws ShouldNotHappenException
 	 */
+	#[DataProvider('superglobalsProvider')]
 	public function testNonSuperglobalInConfig(string $superglobal, ?string $exceptionClass)
 	{
 		if ($exceptionClass) {

diff --git a/tests/File/FilePathTest.php b/tests/File/FilePathTest.php
@@ -6,6 +6,7 @@
 use Generator;
 use PHPStan\File\FileHelper;
 use PHPStan\Testing\PHPStanTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class FilePathTest extends PHPStanTestCase
 {
@@ -28,6 +29,7 @@ protected function setUp(): void
 	/**
 	 * @dataProvider pathProvider
 	 */
+	#[DataProvider('pathProvider')]
 	public function testFnMatch(string $path, string $file, string $fileWithRootDir): void
 	{
 		$this->assertTrue($this->filePath->fnMatch($path, $file));

diff --git a/tests/Identifier/IdentifierTest.php b/tests/Identifier/IdentifierTest.php
@@ -5,6 +5,7 @@
 
 use Generator;
 use PHPStan\Testing\PHPStanTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class IdentifierTest extends PHPStanTestCase
 {
@@ -26,6 +27,7 @@ protected function setUp(): void
 	 * @return void
 	 * @dataProvider matchesProvider
 	 */
+	#[DataProvider('matchesProvider')]
 	public function testMatches(string $pattern, string $value, ?array $excludes): void
 	{
 		$this->assertTrue($this->identifier->matches($pattern, $value, $excludes));
@@ -39,6 +41,7 @@ public function testMatches(string $pattern, string $value, ?array $excludes): v
 	 * @return void
 	 * @dataProvider doesNotMatchProvider
 	 */
+	#[DataProvider('doesNotMatchProvider')]
 	public function testDoesNotMatch(string $pattern, string $value, ?array $excludes): void
 	{
 		$this->assertFalse($this->identifier->matches($pattern, $value, $excludes));

diff --git a/tests/Usages/ClassConstantEnumUsagesTest.php b/tests/Usages/ClassConstantEnumUsagesTest.php
@@ -7,6 +7,7 @@
 use Enums\Enum;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
+use PHPUnit\Framework\Attributes\RequiresPhp;
 use Spaze\PHPStan\Rules\Disallowed\DisallowedConstantFactory;
 use Spaze\PHPStan\Rules\Disallowed\Formatter\Formatter;
 use Spaze\PHPStan\Rules\Disallowed\RuleErrors\DisallowedConstantRuleErrors;
@@ -15,6 +16,7 @@
 /**
  * @requires PHP >= 8.1
  */
+#[RequiresPhp('>= 8.1')]
 class ClassConstantEnumUsagesTest extends RuleTestCase
 {
 

diff --git a/tests/Usages/NamespaceUsagesTypesTest.php b/tests/Usages/NamespaceUsagesTypesTest.php
@@ -5,13 +5,15 @@
 
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
+use PHPUnit\Framework\Attributes\RequiresPhp;
 use Spaze\PHPStan\Rules\Disallowed\DisallowedNamespaceFactory;
 use Spaze\PHPStan\Rules\Disallowed\Normalizer\Normalizer;
 use Spaze\PHPStan\Rules\Disallowed\RuleErrors\DisallowedNamespaceRuleErrors;
 
 /**
  * @requires PHP >= 8.1
  */
+#[RequiresPhp('>= 8.1')]
 class NamespaceUsagesTypesTest extends RuleTestCase
 {