Apply suggestions from code review

arjenm · nicolas-grekas · arjenm · commit ad4d9c09afd8 · 2025-03-20T07:21:56.000+01:00
Revert strictness tests for default ifTrue and ifFalse

Co-authored-by: Nicolas Grekas &lt;nicolas.grekas@gmail.com&gt;
diff --git a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
@@ -61,7 +61,7 @@ public function always(?\Closure $then = null): static
      */
     public function ifTrue(?\Closure $closure = null): static
     {
-        $this->ifPart = $closure ?? static fn ($v) => (bool) $v;
+        $this->ifPart = $closure ?? static fn ($v) => true === $v;
         $this->allowedTypes = self::TYPE_ANY;
 
         return $this;
@@ -76,7 +76,7 @@ public function ifTrue(?\Closure $closure = null): static
      */
     public function ifFalse(?\Closure $closure = null): static
     {
-        $this->ifPart = $closure ? static fn ($v) => ! $closure($v) : static fn ($v) => ! $v;
+        $this->ifPart = $closure ? static fn ($v) => !$closure($v) : static fn ($v) => false === $v;
         $this->allowedTypes = self::TYPE_ANY;
 
         return $this;
diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php
@@ -36,12 +36,6 @@ public function testIfTrueExpression()
         ->end();
         $this->assertFinalizedValueIs('new_value', $test, ['key' => true]);
 
-        $test = $this->getTestBuilder()
-            ->ifTrue()
-            ->then($this->returnClosure('new_value'))
-        ->end();
-        $this->assertFinalizedValueIs('new_value', $test, ['key' => 1]);
-
         $test = $this->getTestBuilder()
             ->ifTrue(fn () => true)
             ->then($this->returnClosure('new_value'))
@@ -75,12 +69,6 @@ public function testIfFalseExpression()
         ->end();
         $this->assertFinalizedValueIs('new_value', $test, ['key' => false]);
 
-        $test = $this->getTestBuilder()
-            ->ifFalse()
-            ->then($this->returnClosure('new_value'))
-        ->end();
-        $this->assertFinalizedValueIs('new_value', $test, ['key' => 0]);
-
         $test = $this->getTestBuilder()
             ->ifFalse(fn ($v) => 'value' === $v)
             ->then($this->returnClosure('new_value'))
