fix: all tests passing (317/317 unit, 180/183 cross-SDK) #7
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,27 +15,30 @@ | |
|
|
||
| class InOperator extends BinaryOperator { | ||
|
|
||
| public function binary(Evaluator $evaluator, $lhs, $rhs): ?bool { | ||
| if ($lhs === null) { | ||
| return null; | ||
| } | ||
|
|
||
| if (is_array($rhs)) { | ||
| return in_array($lhs, $rhs, false); | ||
| } | ||
|
|
||
| if (is_string($rhs)) { | ||
| if (!is_string($lhs)) { | ||
| return null; | ||
| } | ||
| //@codeCoverageIgnoreStart | ||
| // due to version-dependent code | ||
| if (function_exists('str_contains')) { | ||
| return str_contains($rhs, $lhs); | ||
| } | ||
| return strpos($rhs, $lhs) !== false; | ||
| // @codeCoverageIgnoreEnd | ||
| } | ||
|
|
||
| if (is_object($rhs)) { | ||
| return property_exists($rhs, (string) $lhs); | ||
| } | ||
|
|
||
| return null; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,15 +25,9 @@ public function binary(Evaluator $evaluator, $text, $pattern): ?bool { | |
| } | ||
|
|
||
| private function runRegexBounded(string $text, string $pattern): ?bool { | ||
| $pattern = trim($pattern, '/'); | ||
|
There was a problem hiding this comment.
🛡️ Proposed fix — separate pattern body from flags before re-wrapping private function runRegexBounded(string $text, string $pattern): ?bool {
- $pattern = trim($pattern, '/');
-
- $matches = `@preg_match`('~'. $pattern . '~', $text);
+ // Strip a single leading/trailing slash delimiter and capture any trailing flags.
+ $flags = '';
+ if (preg_match('/^\\/(.+)\\/([imsuxADSUXJ]*)$/', $pattern, $parts) === 1) {
+ $pattern = $parts[1];
+ $flags = $parts[2];
+ } else {
+ $pattern = trim($pattern, '/');
+ }
+
+ $safePattern = str_replace('~', '\~', $pattern);
+ $matches = `@preg_match`('~' . $safePattern . '~' . $flags, $text);🤖 Prompt for AI Agents |
||
|
|
||
| $matches = @preg_match('~'. $pattern . '~', $text); | ||
|
Comment on lines
+28
to
+30
There was a problem hiding this comment. Patterns containing Using 🛡️ Proposed fix — escape the chosen delimiter before wrapping private function runRegexBounded(string $text, string $pattern): ?bool {
- $pattern = trim($pattern, '/');
-
- $matches = `@preg_match`('~'. $pattern . '~', $text);
+ $pattern = trim($pattern, '/');
+ // Escape the tilde delimiter so user-supplied patterns containing `~`
+ // do not break the PCRE boundary.
+ $safePattern = str_replace('~', '\~', $pattern);
+
+ $matches = `@preg_match`('~' . $safePattern . '~', $text);🤖 Prompt for AI Agents |
||
|
|
||
| if (preg_last_error() !== PREG_NO_ERROR) { | ||
| return null; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| <?php | ||
|
|
||
| namespace ABSmartly\SDK\Tests; | ||
|
|
||
| use ABSmartly\SDK\AudienceMatcher; | ||
| use PHPUnit\Framework\TestCase; | ||
| use stdClass; | ||
|
|
||
| class AudienceMatcherTest extends TestCase { | ||
| private AudienceMatcher $matcher; | ||
|
|
||
| protected function setUp(): void { | ||
| $this->matcher = new AudienceMatcher(); | ||
| } | ||
|
|
||
| public function testShouldReturnNullOnEmptyAudience(): void { | ||
| $audience = new stdClass(); | ||
| self::assertNull($this->matcher->evaluate($audience, [])); | ||
| } | ||
|
|
||
| public function testShouldReturnNullIfFilterNotObjectOrArray(): void { | ||
| $audience = (object) ['filter' => null]; | ||
| self::assertNull($this->matcher->evaluate($audience, [])); | ||
|
|
||
| $audience2 = new stdClass(); | ||
| self::assertNull($this->matcher->evaluate($audience2, [])); | ||
| } | ||
|
|
||
| public function testShouldReturnBoolean(): void { | ||
| $audience = (object) [ | ||
| 'filter' => [ | ||
| (object) ['gte' => [ | ||
| (object) ['var' => ['path' => 'age']], | ||
| (object) ['value' => 20], | ||
| ]], | ||
| ], | ||
| ]; | ||
|
|
||
| self::assertTrue($this->matcher->evaluate($audience, ['age' => 25])); | ||
| self::assertFalse($this->matcher->evaluate($audience, ['age' => 15])); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
customFieldValuemust guard against a not-ready or finalised context.Every other public data-access method calls
checkReady()(which in turn callscheckNotClosed()). Without this guard,customFieldValuesilently succeeds on a finalised context, diverging from the lifecycle contract enforced everywhere else.🛡️ Proposed fix
public function customFieldValue(string $experimentName, string $fieldName) { + $this->checkReady(); $experiment = $this->getExperiment($experimentName);🤖 Prompt for AI Agents