bug #59318 [Finder] Fix using == as default operator in DateComparator (MatTheCat)

fabpot · fabpot · commit 1236323cd76a · 2024-12-30T19:45:08.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [Finder] Fix using `==` as default operator in `DateComparator` | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #59314 | License | MIT `$matches` can only contain `null` when passing the [`PREG_UNMATCHED_AS_NULL`](https://www.php.net/manual/en/pcre.constants.php#constant.preg-unmatched-as-null) flag. Since the culprit code line predates PHP 7.2 I made it check for an empty string rather than `null`, as `@GlucNAc` suggested. Commits ------- a247d58 [Finder] Fix using `==` as default operator in `DateComparator`
diff --git a/src/Symfony/Component/Finder/Comparator/DateComparator.php b/src/Symfony/Component/Finder/Comparator/DateComparator.php
@@ -36,7 +36,7 @@ public function __construct(string $test)
             throw new \InvalidArgumentException(sprintf('"%s" is not a valid date.', $matches[2]));
         }
 
-        $operator = $matches[1] ?? '==';
+        $operator = $matches[1] ?: '==';
         if ('since' === $operator || 'after' === $operator) {
             $operator = '>';
         }
diff --git a/src/Symfony/Component/Finder/Tests/Comparator/DateComparatorTest.php b/src/Symfony/Component/Finder/Tests/Comparator/DateComparatorTest.php
@@ -59,6 +59,7 @@ public static function getTestData()
             ['after 2005-10-10', [strtotime('2005-10-15')], [strtotime('2005-10-09')]],
             ['since 2005-10-10', [strtotime('2005-10-15')], [strtotime('2005-10-09')]],
             ['!= 2005-10-10', [strtotime('2005-10-11')], [strtotime('2005-10-10')]],
+            ['2005-10-10', [strtotime('2005-10-10')], [strtotime('2005-10-11')]],
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function __construct(string $test)`
`36`	`36`	`throw new \InvalidArgumentException(sprintf('"%s" is not a valid date.', $matches[2]));`
`37`	`37`	`}`
`38`	`38`
`39`		`- $operator = $matches[1] ?? '==';`
	`39`	`+ $operator = $matches[1] ?: '==';`
`40`	`40`	`if ('since' === $operator \|\| 'after' === $operator) {`
`41`	`41`	`$operator = '>';`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ public static function getTestData()`
`59`	`59`	`['after 2005-10-10', [strtotime('2005-10-15')], [strtotime('2005-10-09')]],`
`60`	`60`	`['since 2005-10-10', [strtotime('2005-10-15')], [strtotime('2005-10-09')]],`
`61`	`61`	`['!= 2005-10-10', [strtotime('2005-10-11')], [strtotime('2005-10-10')]],`
	`62`	`+ ['2005-10-10', [strtotime('2005-10-10')], [strtotime('2005-10-11')]],`
`62`	`63`	`];`
`63`	`64`	`}`
`64`	`65`	`}`