remove hasFuncton method from ExprLanguage

verdet23 · verdet23 · commit 5dad24149431 · 2022-08-08T14:01:28.000+03:00
diff --git a/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md b/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md
@@ -1,11 +1,6 @@
 CHANGELOG
 =========
 
-6.2
----
-
-* Add `ExpressionLanguage::hasFunction()` and `ExpressionLanguage::hasFunctionByName()` methods.
-
 6.1
 ---
 
diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
@@ -128,16 +128,6 @@ public function addFunction(ExpressionFunction $function)
         $this->register($function->getName(), $function->getCompiler(), $function->getEvaluator());
     }
 
-    public function hasFunction(ExpressionFunction $function): bool
-    {
-        return $this->hasFunctionByName($function->getName());
-    }
-
-    public function hasFunctionByName(string $functionName): bool
-    {
-        return isset($this->functions[$functionName]);
-    }
-
     public function registerProvider(ExpressionFunctionProviderInterface $provider)
     {
         foreach ($provider->getFunctions() as $function) {
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
@@ -384,28 +384,4 @@ function (ExpressionLanguage $el) {
             ],
         ];
     }
-
-    public function testHasFunction(): void
-    {
-        $expressionLanguage = new ExpressionLanguage();
-
-        $function = new ExpressionFunction('foo', function () {}, function () {});
-
-        $this->assertFalse($expressionLanguage->hasFunction($function));
-
-        $expressionLanguage->addFunction($function);
-
-        $this->assertTrue($expressionLanguage->hasFunction($function));
-    }
-
-    public function testHasFunctionByName(): void
-    {
-        $expressionLanguage = new ExpressionLanguage();
-
-        $this->assertFalse($expressionLanguage->hasFunctionByName('foo'));
-
-        $expressionLanguage->register('foo', function () {}, function () {});
-
-        $this->assertTrue($expressionLanguage->hasFunctionByName('foo'));
-    }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php b/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php
@@ -27,6 +27,8 @@ class ExpressionValidator extends ConstraintValidator
     public function __construct(ExpressionLanguage $expressionLanguage = null)
     {
         $this->expressionLanguage = $expressionLanguage;
+
+        $this->expressionLanguage?->registerProvider(new ExpressionLanguageProvider());
     }
 
     /**
@@ -55,9 +57,6 @@ private function getExpressionLanguage(): ExpressionLanguage
     {
         if (null === $this->expressionLanguage) {
             $this->expressionLanguage = new ExpressionLanguage();
-        }
-
-        if (false === $this->expressionLanguage->hasFunctionByName('is_valid')) {
             $this->expressionLanguage->registerProvider(new ExpressionLanguageProvider());
         }
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php
@@ -326,21 +326,4 @@ public function testIsValidExpression(): void
 
         $this->assertNoViolation();
     }
-
-    public function testExistingIsValidFunctionIsNotOverridden(): void
-    {
-        $used = false;
-
-        $expressionLanguage = new ExpressionLanguage();
-        $expressionLanguage->register('is_valid', function () {}, function () use (&$used) {
-            $used = true;
-        });
-
-        $validator = new ExpressionValidator($expressionLanguage);
-        $validator->initialize($this->context);
-
-        $validator->validate('foo', new Expression('is_valid()'));
-
-        $this->assertTrue($used);
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ class ExpressionValidator extends ConstraintValidator`
`27`	`27`	`public function __construct(ExpressionLanguage $expressionLanguage = null)`
`28`	`28`	`{`
`29`	`29`	`$this->expressionLanguage = $expressionLanguage;`
	`30`	`+`
	`31`	`+ $this->expressionLanguage?->registerProvider(new ExpressionLanguageProvider());`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`/**`
`@@ -55,9 +57,6 @@ private function getExpressionLanguage(): ExpressionLanguage`
`55`	`57`	`{`
`56`	`58`	`if (null === $this->expressionLanguage) {`
`57`	`59`	`$this->expressionLanguage = new ExpressionLanguage();`
`58`		`- }`
`59`		`-`
`60`		`- if (false === $this->expressionLanguage->hasFunctionByName('is_valid')) {`
`61`	`60`	`$this->expressionLanguage->registerProvider(new ExpressionLanguageProvider());`
`62`	`61`	`}`
`63`	`62`