ConditionalTagsExtension: Multiple conditions support

Author: MartinMystikJonas

src/DependencyInjection/ConditionalTagsExtension.php

@@ -12,15 +12,17 @@
 use PHPStan\PhpDoc\TypeNodeResolverExtension;
 use PHPStan\Rules\RegistryFactory as RuleRegistryFactory;
 use PHPStan\ShouldNotHappenException;
+use function array_reduce;
 use function count;
+use function is_array;
 use function sprintf;
 
 class ConditionalTagsExtension extends CompilerExtension
 {
 
 	public function getConfigSchema(): Nette\Schema\Schema
 	{
-		$bool = Expect::bool();
+		$bool = Expect::anyOf(Expect::bool(), Expect::listOf(Expect::bool()));
 		return Expect::arrayOf(Expect::structure([
 			BrokerFactory::PROPERTIES_CLASS_REFLECTION_EXTENSION_TAG => $bool,
 			BrokerFactory::METHODS_CLASS_REFLECTION_EXTENSION_TAG => $bool,
@@ -51,6 +53,9 @@ public function beforeCompile(): void
 			}
 			foreach ($services as $service) {
 				foreach ($tags as $tag => $parameter) {
+					if (is_array($parameter)) {
+						$parameter = array_reduce($parameter, static fn ($carry, $item) => $carry && (bool) $item, true);
+					}
 					if ((bool) $parameter) {
 						$service->addTag($tag);
 						continue;

tests/PHPStan/DependencyInjection/ConditionalTagsExtensionTest.php

@@ -0,0 +1,35 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\DependencyInjection;
+
+use PHPStan\Rules\RegistryFactory as RuleRegistryFactory;
+use PHPStan\Testing\PHPStanTestCase;
+use function array_map;
+use function get_class;
+
+class ConditionalTagsExtensionTest extends PHPStanTestCase
+{
+
+	public function testConditionalTags(): void
+	{
+		$enabledServices = self::getContainer()->getServicesByTag(RuleRegistryFactory::RULE_TAG);
+		$enabledServices = array_map(static fn ($service) => get_class($service), $enabledServices);
+		$this->assertNotContains(TestedConditionalServiceDisabled::class, $enabledServices);
+		$this->assertContains(TestedConditionalServiceEnabled::class, $enabledServices);
+		$this->assertNotContains(TestedConditionalServiceDisabledDisabled::class, $enabledServices);
+		$this->assertNotContains(TestedConditionalServiceDisabledEnabled::class, $enabledServices);
+		$this->assertNotContains(TestedConditionalServiceEnabledDisabled::class, $enabledServices);
+		$this->assertContains(TestedConditionalServiceEnabledEnabled::class, $enabledServices);
+	}
+
+	/**
+	 * @return string[]
+	 */
+	public static function getAdditionalConfigFiles(): array
+	{
+		return [
+			__DIR__ . '/conditionalTags.neon',
+		];
+	}
+
+}

tests/PHPStan/DependencyInjection/TestedConditionalServiceDisabled.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\DependencyInjection;
+
+class TestedConditionalServiceDisabled
+{
+
+}

tests/PHPStan/DependencyInjection/TestedConditionalServiceDisabledDisabled.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\DependencyInjection;
+
+class TestedConditionalServiceDisabledDisabled
+{
+
+}

tests/PHPStan/DependencyInjection/TestedConditionalServiceDisabledEnabled.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\DependencyInjection;
+
+class TestedConditionalServiceDisabledEnabled
+{
+
+}

tests/PHPStan/DependencyInjection/TestedConditionalServiceEnabled.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\DependencyInjection;
+
+class TestedConditionalServiceEnabled
+{
+
+}

tests/PHPStan/DependencyInjection/TestedConditionalServiceEnabledDisabled.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\DependencyInjection;
+
+class TestedConditionalServiceEnabledDisabled
+{
+
+}

tests/PHPStan/DependencyInjection/TestedConditionalServiceEnabledEnabled.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\DependencyInjection;
+
+class TestedConditionalServiceEnabledEnabled
+{
+
+}

tests/PHPStan/DependencyInjection/conditionalTags.neon

@@ -0,0 +1,29 @@
+parameters:
+	enabled: true
+	disabled: false
+
+parametersSchema:
+	enabled: bool()
+	disabled: bool()
+
+conditionalTags:
+	PHPStan\DependencyInjection\TestedConditionalServiceDisabled:
+		phpstan.rules.rule: %disabled%
+	PHPStan\DependencyInjection\TestedConditionalServiceEnabled:
+		phpstan.rules.rule: %enabled%
+	PHPStan\DependencyInjection\TestedConditionalServiceDisabledDisabled:
+		phpstan.rules.rule: [%disabled%, %disabled%]
+	PHPStan\DependencyInjection\TestedConditionalServiceDisabledEnabled:
+		phpstan.rules.rule: [%disabled%, %enabled%]
+	PHPStan\DependencyInjection\TestedConditionalServiceEnabledDisabled:
+		phpstan.rules.rule: [%enabled%, %disabled%]
+	PHPStan\DependencyInjection\TestedConditionalServiceEnabledEnabled:
+		phpstan.rules.rule: [%enabled%, %enabled%]
+
+services:
+	- PHPStan\DependencyInjection\TestedConditionalServiceDisabled
+	- PHPStan\DependencyInjection\TestedConditionalServiceEnabled
+	- PHPStan\DependencyInjection\TestedConditionalServiceDisabledDisabled
+	- PHPStan\DependencyInjection\TestedConditionalServiceDisabledEnabled
+	- PHPStan\DependencyInjection\TestedConditionalServiceEnabledDisabled
+	- PHPStan\DependencyInjection\TestedConditionalServiceEnabledEnabled