WIP Errors when allow config is unused

src/Allowed/Allowed.php

@@ -109,7 +109,7 @@ public function isAllowed(?Node $node, Scope $scope, ?array $args, Disallowed $d
 	}
 
 
-	private function callMatches(Scope $scope, string $call): bool
+	private function callMatches(Scope $scope, AllowedConfigItem $call): bool
 	{
 		if ($scope->getFunction() instanceof MethodReflection) {
 			$name = $this->formatter->getFullyQualified($scope->getFunction()->getDeclaringClass()->getDisplayName(false), $scope->getFunction());
@@ -118,7 +118,7 @@ private function callMatches(Scope $scope, string $call): bool
 		} else {
 			$name = '';
 		}
-		return $this->identifier->matches($call, $name);
+		return $call->matches(fn(string $item): bool => $this->identifier->matches($item, $name));
 	}
 
 
@@ -178,7 +178,7 @@ private function hasAllowedParamsInAllowed(Scope $scope, ?array $args, Disallowe
 
 	/**
 	 * @param list<FakeReflectionAttribute|ReflectionAttribute|BetterReflectionAttribute> $attributes
-	 * @param list<string> $allowConfig
+	 * @param list<AllowedConfigItem> $allowConfig
 	 * @return bool
 	 */
 	private function hasAllowedAttribute(array $attributes, array $allowConfig): bool
@@ -189,7 +189,7 @@ private function hasAllowedAttribute(array $attributes, array $allowConfig): boo
 		}
 		foreach ($allowConfig as $allowAttribute) {
 			foreach ($names as $name) {
-				if ($this->identifier->matches($allowAttribute, $name)) {
+				if ($allowAttribute->matches(fn(string $item) => $this->identifier->matches($item, $name))) {
 					return true;
 				}
 			}

src/Allowed/AllowedConfig.php

@@ -8,34 +8,34 @@
 class AllowedConfig
 {
 
-	/** @var list<string> */
+	/** @var list<AllowedConfigItem> */
 	private array $allowIn;
 
-	/** @var list<string> */
+	/** @var list<AllowedConfigItem> */
 	private array $allowExceptIn;
 
-	/** @var list<string> */
+	/** @var list<AllowedConfigItem> */
 	private array $allowInCalls;
 
-	/** @var list<string> */
+	/** @var list<AllowedConfigItem> */
 	private array $allowExceptInCalls;
 
-	/** @var list<string> */
+	/** @var list<AllowedConfigItem> */
 	private array $allowInClassWithAttributes;
 
-	/** @var list<string> */
+	/** @var list<AllowedConfigItem> */
 	private array $allowExceptInClassWithAttributes;
 
-	/** @var list<string> */
+	/** @var list<AllowedConfigItem> */
 	private array $allowInCallsWithAttributes;
 
-	/** @var list<string> */
+	/** @var list<AllowedConfigItem> */
 	private array $allowExceptInCallsWithAttributes;
 
-	/** @var list<string> */
+	/** @var list<AllowedConfigItem> */
 	private array $allowInClassWithMethodAttributes;
 
-	/** @var list<string> */
+	/** @var list<AllowedConfigItem> */
 	private array $allowExceptInClassWithMethodAttributes;
 
 	/** @var array<int|string, Param> */
@@ -52,16 +52,16 @@ class AllowedConfig
 
 
 	/**
-	 * @param list<string> $allowIn
-	 * @param list<string> $allowExceptIn
-	 * @param list<string> $allowInCalls
-	 * @param list<string> $allowExceptInCalls
-	 * @param list<string> $allowInClassWithAttributes
-	 * @param list<string> $allowExceptInClassWithAttributes
-	 * @param list<string> $allowInCallsWithAttributes
-	 * @param list<string> $allowExceptInCallsWithAttributes
-	 * @param list<string> $allowInClassWithMethodAttributes
-	 * @param list<string> $allowExceptInClassWithMethodAttributes
+	 * @param list<AllowedConfigItem> $allowIn
+	 * @param list<AllowedConfigItem> $allowExceptIn
+	 * @param list<AllowedConfigItem> $allowInCalls
+	 * @param list<AllowedConfigItem> $allowExceptInCalls
+	 * @param list<AllowedConfigItem> $allowInClassWithAttributes
+	 * @param list<AllowedConfigItem> $allowExceptInClassWithAttributes
+	 * @param list<AllowedConfigItem> $allowInCallsWithAttributes
+	 * @param list<AllowedConfigItem> $allowExceptInCallsWithAttributes
+	 * @param list<AllowedConfigItem> $allowInClassWithMethodAttributes
+	 * @param list<AllowedConfigItem> $allowExceptInClassWithMethodAttributes
 	 * @param array<int|string, Param> $allowParamsInAllowed
 	 * @param array<int|string, Param> $allowParamsAnywhere
 	 * @param array<int|string, Param> $allowExceptParamsInAllowed
@@ -101,7 +101,7 @@ public function __construct(
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowIn(): array
 	{
@@ -110,7 +110,7 @@ public function getAllowIn(): array
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowExceptIn(): array
 	{
@@ -119,7 +119,7 @@ public function getAllowExceptIn(): array
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowInCalls(): array
 	{
@@ -128,7 +128,7 @@ public function getAllowInCalls(): array
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowExceptInCalls(): array
 	{
@@ -137,7 +137,7 @@ public function getAllowExceptInCalls(): array
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowInClassWithAttributes(): array
 	{
@@ -146,7 +146,7 @@ public function getAllowInClassWithAttributes(): array
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowExceptInClassWithAttributes(): array
 	{
@@ -155,7 +155,7 @@ public function getAllowExceptInClassWithAttributes(): array
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowInCallsWithAttributes(): array
 	{
@@ -164,7 +164,7 @@ public function getAllowInCallsWithAttributes(): array
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowExceptInCallsWithAttributes(): array
 	{
@@ -173,7 +173,7 @@ public function getAllowExceptInCallsWithAttributes(): array
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowInClassWithMethodAttributes(): array
 	{
@@ -182,7 +182,7 @@ public function getAllowInClassWithMethodAttributes(): array
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowExceptInClassWithMethodAttributes(): array
 	{

src/Allowed/AllowedConfigFactory.php

@@ -46,33 +46,39 @@ public function __construct(
 	 */
 	public function getConfig(array $allowed): AllowedConfig
 	{
-		$allowInCalls = $allowExceptInCalls = $allowInClassWithAttributes = $allowExceptInClassWithAttributes = [];
+		$allowIn = $allowExceptIn = $allowInCalls = $allowExceptInCalls = $allowInClassWithAttributes = $allowExceptInClassWithAttributes = [];
 		$allowInCallsWithAttributes = $allowExceptInCallsWithAttributes = $allowInClassWithMethodAttributes = $allowExceptInClassWithMethodAttributes = [];
 		$allowParamsInAllowed = $allowParamsAnywhere = $allowExceptParamsInAllowed = $allowExceptParams = [];
 
+		foreach ($allowed['allowIn'] ?? [] as $allowInPath) {
+			$allowIn[] = new AllowedConfigItem($allowInPath);
+		}
+		foreach ($allowed['allowExceptIn'] ?? $allowed['disallowIn'] ?? [] as $allowExceptInPath) {
+			$allowExceptIn[] = new AllowedConfigItem($allowExceptInPath);
+		}
 		foreach ($allowed['allowInFunctions'] ?? $allowed['allowInMethods'] ?? [] as $allowedCall) {
-			$allowInCalls[] = $this->normalizer->normalizeCall($allowedCall);
+			$allowInCalls[] = new AllowedConfigItem($this->normalizer->normalizeCall($allowedCall));
 		}
 		foreach ($allowed['allowExceptInFunctions'] ?? $allowed['allowExceptInMethods'] ?? $allowed['disallowInFunctions'] ?? $allowed['disallowInMethods'] ?? [] as $disallowedCall) {
-			$allowExceptInCalls[] = $this->normalizer->normalizeCall($disallowedCall);
+			$allowExceptInCalls[] = new AllowedConfigItem($this->normalizer->normalizeCall($disallowedCall));
 		}
 		foreach ($allowed['allowInClassWithAttributes'] ?? [] as $allowInClassAttribute) {
-			$allowInClassWithAttributes[] = $this->normalizer->normalizeAttribute($allowInClassAttribute);
+			$allowInClassWithAttributes[] = new AllowedConfigItem($this->normalizer->normalizeAttribute($allowInClassAttribute));
 		}
 		foreach ($allowed['allowExceptInClassWithAttributes'] ?? $allowed['disallowInClassWithAttributes'] ?? [] as $allowExceptInClassAttribute) {
-			$allowExceptInClassWithAttributes[] = $this->normalizer->normalizeAttribute($allowExceptInClassAttribute);
+			$allowExceptInClassWithAttributes[] = new AllowedConfigItem($this->normalizer->normalizeAttribute($allowExceptInClassAttribute));
 		}
 		foreach ($allowed['allowInFunctionsWithAttributes'] ?? $allowed['allowInMethodsWithAttributes'] ?? [] as $allowInMethodAttribute) {
-			$allowInCallsWithAttributes[] = $this->normalizer->normalizeAttribute($allowInMethodAttribute);
+			$allowInCallsWithAttributes[] = new AllowedConfigItem($this->normalizer->normalizeAttribute($allowInMethodAttribute));
 		}
 		foreach ($allowed['allowExceptInFunctionsWithAttributes'] ?? $allowed['allowExceptInMethodsWithAttributes'] ?? $allowed['disallowInFunctionsWithAttributes'] ?? $allowed['disallowInMethodsWithAttributes'] ?? [] as $allowExceptInMethodAttribute) {
-			$allowExceptInCallsWithAttributes[] = $this->normalizer->normalizeAttribute($allowExceptInMethodAttribute);
+			$allowExceptInCallsWithAttributes[] = new AllowedConfigItem($this->normalizer->normalizeAttribute($allowExceptInMethodAttribute));
 		}
 		foreach ($allowed['allowInClassWithMethodAttributes'] ?? [] as $allowInAnyMethodAttribute) {
-			$allowInClassWithMethodAttributes[] = $this->normalizer->normalizeAttribute($allowInAnyMethodAttribute);
+			$allowInClassWithMethodAttributes[] = new AllowedConfigItem($this->normalizer->normalizeAttribute($allowInAnyMethodAttribute));
 		}
 		foreach ($allowed['allowExceptInClassWithMethodAttributes'] ?? $allowed['disallowInClassWithMethodAttributes'] ?? [] as $allowExceptInAnyMethodAttribute) {
-			$allowExceptInClassWithMethodAttributes[] = $this->normalizer->normalizeAttribute($allowExceptInAnyMethodAttribute);
+			$allowExceptInClassWithMethodAttributes[] = new AllowedConfigItem($this->normalizer->normalizeAttribute($allowExceptInAnyMethodAttribute));
 		}
 		foreach ($allowed['allowParamsInAllowed'] ?? [] as $param => $value) {
 			$allowParamsInAllowed[$param] = $this->paramFactory(ParamValueSpecific::class, $param, $value);
@@ -111,8 +117,8 @@ public function getConfig(array $allowed): AllowedConfig
 			$allowExceptParams[$param] = $this->paramFactory(ParamValueCaseInsensitiveExcept::class, $param, $value);
 		}
 		return new AllowedConfig(
-			$allowed['allowIn'] ?? [],
-			$allowed['allowExceptIn'] ?? $allowed['disallowIn'] ?? [],
+			$allowIn,
+			$allowExceptIn,
 			$allowInCalls,
 			$allowExceptInCalls,
 			$allowInClassWithAttributes,

src/Allowed/AllowedConfigItem.php

@@ -0,0 +1,33 @@
+<?php
+declare(strict_types = 1);
+
+namespace Spaze\PHPStan\Rules\Disallowed\Allowed;
+
+class AllowedConfigItem
+{
+
+	private string $item;
+
+
+	public function __construct(string $item)
+	{
+		$this->item = $item;
+	}
+
+
+	public function getItem(): string
+	{
+		return $this->item;
+	}
+
+
+	/**
+	 * @param callable(string): bool $matches
+	 * @return bool
+	 */
+	public function matches(callable $matches): bool
+	{
+		return $matches($this->item);
+	}
+
+}

src/Allowed/AllowedPath.php

@@ -19,10 +19,10 @@ public function __construct(FilePath $filePath)
 	}
 
 
-	public function matches(Scope $scope, string $allowedPath): bool
+	public function matches(Scope $scope, AllowedConfigItem $allowedPath): bool
 	{
 		$file = $scope->getTraitReflection() ? $scope->getTraitReflection()->getFileName() : $scope->getFile();
-		return $file !== null && $this->filePath->fnMatch($allowedPath, $file);
+		return $file !== null && $allowedPath->matches(fn(string $path): bool => $this->filePath->fnMatch($path, $file));
 	}
 
 

src/Disallowed.php

@@ -3,65 +3,67 @@
 
 namespace Spaze\PHPStan\Rules\Disallowed;
 
+use Spaze\PHPStan\Rules\Disallowed\Allowed\AllowedConfigItem;
+
 interface Disallowed
 {
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowIn(): array;
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowExceptIn(): array;
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowInCalls(): array;
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowExceptInCalls(): array;
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowInClassWithAttributes(): array;
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowExceptInClassWithAttributes(): array;
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowInCallsWithAttributes(): array;
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowExceptInCallsWithAttributes(): array;
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowInClassWithMethodAttributes(): array;
 
 
 	/**
-	 * @return list<string>
+	 * @return list<AllowedConfigItem>
 	 */
 	public function getAllowExceptInClassWithMethodAttributes(): array;