Skip to content

Commit

Permalink
Merge branch '3.4' into 4.3
Browse files Browse the repository at this point in the history
* 3.4:
  Improve some URLs
  Fix test compatibility with 4.x components
  [Cache] cs fix
  • Loading branch information
nicolas-grekas committed Aug 8, 2019
2 parents 24d5147 + fb47597 commit 69d6dac
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Constraints/AbstractComparisonValidator.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function validate($value, Constraint $constraint)
// Convert strings to DateTimes if comparing another DateTime
// This allows to compare with any date/time value supported by
// the DateTime constructor:
// http://php.net/manual/en/datetime.formats.php
// https://php.net/datetime.formats
if (\is_string($comparedValue)) {
if ($value instanceof \DateTimeImmutable) {
// If $value is immutable, convert the compared value to a
Expand Down
2 changes: 1 addition & 1 deletion Constraints/RangeValidator.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function validate($value, Constraint $constraint)
// Convert strings to DateTimes if comparing another DateTime
// This allows to compare with any date/time value supported by
// the DateTime constructor:
// http://php.net/manual/en/datetime.formats.php
// https://php.net/datetime.formats
if ($value instanceof \DateTimeInterface) {
if (\is_string($min)) {
$min = new \DateTime($min);
Expand Down
2 changes: 1 addition & 1 deletion Tests/Constraints/IpValidatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ public function getInvalidReservedIpsV6()
{
// Quoting after official filter documentation:
// "FILTER_FLAG_NO_RES_RANGE = This flag does not apply to IPv6 addresses."
// Full description: http://php.net/manual/en/filter.filters.flags.php
// Full description: https://php.net/filter.filters.flags
return $this->getInvalidIpsV6();
}

Expand Down

0 comments on commit 69d6dac

Please sign in to comment.