Skip to content

Commit 5f12afa

Browse files
committed
Merge branch '5.4' into 6.2
* 5.4: Fix LICENSE CI check fixes retrieving multiple values for extra fields [String] Remove duplicates in fold maps fail with a meaningful error when a needed package is missing [DependencyInjection] Fix combinatory explosion when autowiring union and intersection types Update license years (last time) [Tests] New iteration of removing `$this` occurrences in future static data providers
2 parents c90dc44 + e5f2f51 commit 5f12afa

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2023 Fabien Potencier
1+
Copyright (c) 2004-present Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

Tests/Iterator/DateRangeFilterIteratorTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class DateRangeFilterIteratorTest extends RealIteratorTestCase
2222
public function testAccept($size, $expected)
2323
{
2424
$files = self::$files;
25-
$files[] = self::toAbsolute('doesnotexist');
25+
$files[] = static::toAbsolute('doesnotexist');
2626
$inner = new Iterator($files);
2727

2828
$iterator = new DateRangeFilterIterator($inner, $size);
@@ -88,9 +88,9 @@ public function getAcceptData()
8888
];
8989

9090
return [
91-
[[new DateComparator('since 20 years ago')], $this->toAbsolute($since20YearsAgo)],
92-
[[new DateComparator('since 2 months ago')], $this->toAbsolute($since2MonthsAgo)],
93-
[[new DateComparator('until last month')], $this->toAbsolute($untilLastMonth)],
91+
[[new DateComparator('since 20 years ago')], static::toAbsolute($since20YearsAgo)],
92+
[[new DateComparator('since 2 months ago')], static::toAbsolute($since2MonthsAgo)],
93+
[[new DateComparator('until last month')], static::toAbsolute($untilLastMonth)],
9494
];
9595
}
9696
}

0 commit comments

Comments
 (0)