Define parameters as a structure (#222)

Close #192

disallowed-loose-calls.neon

@@ -9,4 +9,4 @@ parameters:
 			function: 'htmlspecialchars()'
 			message: 'set the $flags parameter to `ENT_QUOTES` to also convert single quotes to entities to prevent some HTML injection bugs'
 			allowParamFlagsAnywhere:
-				2: ::ENT_QUOTES
+				2: ::constant(ENT_QUOTES)

src/DisallowedConstantFactory.php

@@ -20,7 +20,7 @@ public function __construct(Normalizer $normalizer)
 
 
 	/**
-	 * @param array<array{class?:string, constant?:string, message?:string, allowIn?:list<string>, allowExceptIn?:list<string>, disallowIn?:list<string>, errorIdentifier?:string, errorTip?:string}> $config
+	 * @param array<array{class?:string, constant?:string|list<string>, message?:string, allowIn?:list<string>, allowExceptIn?:list<string>, disallowIn?:list<string>, errorIdentifier?:string, errorTip?:string}> $config
 	 * @return list<DisallowedConstant>
 	 * @throws ShouldNotHappenException
 	 */

src/DisallowedNamespaceFactory.php

@@ -20,7 +20,7 @@ public function __construct(Normalizer $normalizer)
 
 
 	/**
-	 * @param array<array{namespace?:string, class?:string, exclude?:string|list<string>, message?:string, allowIn?:list<string>, allowExceptIn?:list<string>, disallowIn?:list<string>, errorIdentifier?:string, errorTip?:string}> $config
+	 * @param array<array{namespace?:string|list<string>, class?:string|list<string>, exclude?:string|list<string>, message?:string, allowIn?:list<string>, allowExceptIn?:list<string>, disallowIn?:list<string>, errorIdentifier?:string, errorTip?:string}> $config
 	 * @return list<DisallowedNamespace>
 	 */
 	public function createFromConfig(array $config): array

src/DisallowedSuperglobalFactory.php

@@ -25,7 +25,7 @@ class DisallowedSuperglobalFactory implements DisallowedVariableFactory
 
 
 	/**
-	 * @param array<array{superglobal?:string, message?:string, allowIn?:list<string>, allowExceptIn?:list<string>, disallowIn?:list<string>, errorIdentifier?:string, errorTip?:string}> $config
+	 * @param array<array{superglobal?:string|list<string>, message?:string, allowIn?:list<string>, allowExceptIn?:list<string>, disallowIn?:list<string>, errorIdentifier?:string, errorTip?:string}> $config
 	 * @return list<DisallowedVariable>
 	 * @throws ShouldNotHappenException
 	 */

src/Usages/ClassConstantUsages.php

@@ -46,7 +46,7 @@ class ClassConstantUsages implements Rule
 	 * @param DisallowedConstantFactory $disallowedConstantFactory
 	 * @param TypeResolver $typeResolver
 	 * @param Formatter $formatter
-	 * @param array<array{class?:string, constant?:string, message?:string, allowIn?:list<string>}> $disallowedConstants
+	 * @param array<array{class?:string, constant?:string|list<string>, message?:string, allowIn?:list<string>}> $disallowedConstants
 	 * @throws ShouldNotHappenException
 	 */
 	public function __construct(

src/Usages/NamespaceUsages.php

@@ -43,7 +43,7 @@ class NamespaceUsages implements Rule
 	 * @param DisallowedNamespaceRuleErrors $disallowedNamespaceRuleErrors
 	 * @param DisallowedNamespaceFactory $disallowNamespaceFactory
 	 * @param Normalizer $normalizer
-	 * @param array<array{namespace:string, message?:string, allowIn?:list<string>}> $forbiddenNamespaces
+	 * @param array<array{namespace?:string|list<string>, class?:string|list<string>, exclude?:string|list<string>, message?:string, allowIn?:list<string>, allowExceptIn?:list<string>, disallowIn?:list<string>, errorIdentifier?:string, errorTip?:string}> $forbiddenNamespaces
 	 */
 	public function __construct(
 		DisallowedNamespaceRuleErrors $disallowedNamespaceRuleErrors,

tests/Configs/LooseConfigFunctionCallsTest.php

@@ -3,54 +3,16 @@
 
 namespace Spaze\PHPStan\Rules\Disallowed\Configs;
 
-use Nette\Neon\Neon;
-use PHPStan\File\FileHelper;
 use PHPStan\Rules\Rule;
-use PHPStan\ShouldNotHappenException;
 use PHPStan\Testing\RuleTestCase;
-use Spaze\PHPStan\Rules\Disallowed\Allowed\Allowed;
-use Spaze\PHPStan\Rules\Disallowed\Allowed\AllowedPath;
 use Spaze\PHPStan\Rules\Disallowed\Calls\FunctionCalls;
-use Spaze\PHPStan\Rules\Disallowed\DisallowedCallFactory;
-use Spaze\PHPStan\Rules\Disallowed\File\FilePath;
-use Spaze\PHPStan\Rules\Disallowed\Formatter\Formatter;
-use Spaze\PHPStan\Rules\Disallowed\Identifier\Identifier;
-use Spaze\PHPStan\Rules\Disallowed\Normalizer\Normalizer;
-use Spaze\PHPStan\Rules\Disallowed\RuleErrors\DisallowedCallsRuleErrors;
 
 class LooseConfigFunctionCallsTest extends RuleTestCase
 {
 
-	/**
-	 * @throws ShouldNotHappenException
-	 */
 	protected function getRule(): Rule
 	{
-		// Load the configuration from this file
-		$config = Neon::decode(file_get_contents(__DIR__ . '/../../disallowed-loose-calls.neon'));
-		// emulate how the real config loader expands constants that are used in the config file above (e.g. ::ENT_QUOTES)
-		foreach ($config['parameters']['disallowedFunctionCalls'] as &$call) {
-			foreach (['allowParamsAnywhere', 'allowParamFlagsAnywhere'] as $key) {
-				if (!isset($call[$key])) {
-					continue;
-				}
-				foreach ($call[$key] as &$param) {
-					if (is_string($param) && preg_match('/^::([A-Z0-9_]+)$/', $param, $matches)) {
-						$param = constant($matches[1]);
-					}
-				}
-			}
-		}
-		$normalizer = new Normalizer();
-		$formatter = new Formatter($normalizer);
-		$filePath = new FilePath(new FileHelper(__DIR__));
-		$allowed = new Allowed($formatter, $normalizer, new AllowedPath($filePath));
-		return new FunctionCalls(
-			new DisallowedCallsRuleErrors($allowed, new Identifier(), $filePath, $formatter),
-			new DisallowedCallFactory($formatter, $normalizer, $allowed),
-			$this->createReflectionProvider(),
-			$config['parameters']['disallowedFunctionCalls']
-		);
+		return self::getContainer()->getByType(FunctionCalls::class);
 	}
 
 
@@ -67,4 +29,13 @@ public function testRule(): void
 		]);
 	}
 
+
+	public static function getAdditionalConfigFiles(): array
+	{
+		return [
+			__DIR__ . '/../../extension.neon',
+			__DIR__ . '/../../disallowed-loose-calls.neon',
+		];
+	}
+
 }