fix: throw exception for conditional flow methods without underscore prefix on PropelConditionalProxy

Previously, __call() silently returned $this for ALL method calls,
including conditional flow methods called without the underscore prefix
(e.g. endif() instead of _endif()). This made such typos impossible to
detect — the proxy would swallow the call and all subsequent chained
calls, producing silently incorrect query results.

Now detects calls to conditional flow methods (if, elseif, else, endif)
without the underscore prefix and throws a BadMethodCallException with a
helpful message. All other method calls are still silently skipped as
before, since Criteria subclasses use __call for virtual methods
(filterByX, orderByX, etc.).

Author: oojacoboo

src/Propel/Runtime/Util/PropelConditionalProxy.php

@@ -8,6 +8,7 @@
 
 namespace Propel\Runtime\Util;
 
+use BadMethodCallException;
 use Propel\Runtime\ActiveQuery\Criteria;
 
 /**
@@ -171,13 +172,31 @@ public function getCriteriaOrProxy()
     }
 
     /**
+     * Catches calls to non-conditional methods when the conditional state is false.
+     *
+     * Most method calls are silently skipped (the condition is false, so they
+     * should not execute). However, calling a conditional flow method without
+     * the underscore prefix (e.g. endif() instead of _endif()) is always a bug
+     * that breaks the entire query chain — so we catch that specific mistake.
+     *
      * @param string $name
      * @param array $arguments
      *
+     * @throws \BadMethodCallException if the method name matches a conditional flow method without underscore prefix
+     *
      * @return $this
      */
     public function __call(string $name, array $arguments)
     {
+        if (in_array($name, ['if', 'elseif', 'else', 'endif'], true)) {
+            throw new BadMethodCallException(sprintf(
+                'Call to undefined method %s::%s(). Did you mean "_%s" (with underscore prefix)?',
+                get_class($this->criteria),
+                $name,
+                $name,
+            ));
+        }
+
         return $this;
     }
 }

tests/Propel/Tests/Runtime/Util/PropelConditionalProxyTest.php

@@ -8,6 +8,7 @@
 
 namespace Propel\Tests\Runtime\Util;
 
+use BadMethodCallException;
 use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\Util\PropelConditionalProxy;
 use Propel\Tests\Helpers\BaseTestCase;
@@ -53,6 +54,64 @@ public function testFluidInterface()
         $this->assertEquals($p->_else(), $criteria, '_else returns fluid interface');
     }
 
+    /**
+     * @return void
+     */
+    public function testValidMethodCallsAreSkippedSilently()
+    {
+        $criteria = new ProxyTestCriteria();
+        $p = new TestPropelConditionalProxy($criteria, false);
+
+        // Methods that exist on the criteria should be silently skipped
+        $this->assertSame($p, $p->test(), 'Valid method calls should return $this when condition is false');
+        $this->assertSame($p, $p->dummy(), 'Valid method calls should return $this when condition is false');
+        $this->assertFalse($criteria->getTest(), 'Method should not have been executed on criteria');
+    }
+
+    /**
+     * @return void
+     */
+    public function testArbitraryMethodCallsAreSkippedSilently()
+    {
+        $criteria = new ProxyTestCriteria();
+        $p = new TestPropelConditionalProxy($criteria, false);
+
+        // Arbitrary method names should be silently skipped, since Criteria
+        // subclasses use __call for virtual methods (filterByX, orderByX, etc.)
+        $this->assertSame($p, $p->filterBySomething('value'));
+        $this->assertSame($p, $p->orderByName());
+        $this->assertSame($p, $p->anyOtherMethod());
+    }
+
+    /**
+     * @dataProvider conditionalFlowMethodsWithoutUnderscoreProvider
+     *
+     * @return void
+     */
+    public function testConditionalFlowMethodsWithoutUnderscoreThrowException(string $method)
+    {
+        $criteria = new ProxyTestCriteria();
+        $p = new TestPropelConditionalProxy($criteria, false);
+
+        $this->expectException(BadMethodCallException::class);
+        $this->expectExceptionMessage(sprintf('Did you mean "_%s"', $method));
+
+        $p->$method();
+    }
+
+    /**
+     * @return array<array<string>>
+     */
+    public static function conditionalFlowMethodsWithoutUnderscoreProvider(): array
+    {
+        return [
+            ['if'],
+            ['elseif'],
+            ['else'],
+            ['endif'],
+        ];
+    }
+
     /**
      * @return void
      */