Skip to content

Commit 93392cf

Browse files
soyukaalanpoulain
soyuka
authored and
alanpoulain
committed
fix apifilter
1 parent b9bb09d commit 93392cf

23 files changed

+86
-113
lines changed

‎tests/Fixtures/TestBundle/Document/Content.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class Content implements \JsonSerializable
4444
* cascade={"persist"},
4545
* )
4646
*/
47-
private \Doctrine\Common\Collections\Collection & iterable $fields;
47+
private $fields;
4848
/**
4949
* @ODM\Field(type="string")
5050
*/

‎tests/Fixtures/TestBundle/Document/ConvertedBoolean.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313

1414
namespace ApiPlatform\Tests\Fixtures\TestBundle\Document;
1515

16-
use ApiPlatform\Core\Annotation\ApiFilter;
1716
use ApiPlatform\Doctrine\Odm\Filter\BooleanFilter;
17+
use ApiPlatform\Metadata\ApiFilter;
1818
use ApiPlatform\Metadata\ApiResource;
1919
use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
2020

2121
/**
2222
* @ODM\Document
23-
* @ApiFilter (BooleanFilter::class)
2423
*/
24+
#[ApiFilter(BooleanFilter::class)]
2525
#[ApiResource]
2626
class ConvertedBoolean
2727
{

‎tests/Fixtures/TestBundle/Document/ConvertedDate.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313

1414
namespace ApiPlatform\Tests\Fixtures\TestBundle\Document;
1515

16-
use ApiPlatform\Core\Annotation\ApiFilter;
1716
use ApiPlatform\Doctrine\Odm\Filter\DateFilter;
17+
use ApiPlatform\Metadata\ApiFilter;
1818
use ApiPlatform\Metadata\ApiResource;
1919
use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
2020

2121
/**
2222
* @ODM\Document
23-
* @ApiFilter (DateFilter::class)
2423
*/
24+
#[ApiFilter(DateFilter::class)]
2525
#[ApiResource]
2626
class ConvertedDate
2727
{

‎tests/Fixtures/TestBundle/Document/ConvertedInteger.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313

1414
namespace ApiPlatform\Tests\Fixtures\TestBundle\Document;
1515

16-
use ApiPlatform\Core\Annotation\ApiFilter;
1716
use ApiPlatform\Doctrine\Odm\Filter\NumericFilter;
1817
use ApiPlatform\Doctrine\Odm\Filter\OrderFilter;
1918
use ApiPlatform\Doctrine\Odm\Filter\RangeFilter;
19+
use ApiPlatform\Metadata\ApiFilter;
2020
use ApiPlatform\Metadata\ApiResource;
2121
use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
2222

2323
/**
2424
* @ODM\Document
25-
* @ApiFilter (NumericFilter::class, properties={"nameConverted"})
26-
* @ApiFilter (RangeFilter::class, properties={"nameConverted"})
27-
* @ApiFilter (OrderFilter::class, properties={"nameConverted"})
2825
*/
26+
#[ApiFilter(NumericFilter::class, properties: ['nameConverted'])]
27+
#[ApiFilter(RangeFilter::class, properties: ['nameConverted'])]
28+
#[ApiFilter(OrderFilter::class, properties: ['nameConverted'])]
2929
#[ApiResource]
3030
class ConvertedInteger
3131
{

‎tests/Fixtures/TestBundle/Document/ConvertedOwner.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
/**
2222
* @ODM\Document
23-
* @ApiFilter (SearchFilter::class, properties={"nameConverted.nameConverted"="partial"})
2423
*/
24+
#[ApiFilter(SearchFilter::class, properties: ['nameConverted.nameConverted' => 'partial'])]
2525
#[ApiResource]
2626
class ConvertedOwner
2727
{

‎tests/Fixtures/TestBundle/Document/ConvertedString.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313

1414
namespace ApiPlatform\Tests\Fixtures\TestBundle\Document;
1515

16-
use ApiPlatform\Core\Annotation\ApiFilter;
1716
use ApiPlatform\Doctrine\Odm\Filter\ExistsFilter;
17+
use ApiPlatform\Metadata\ApiFilter;
1818
use ApiPlatform\Metadata\ApiResource;
1919
use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
2020

2121
/**
2222
* @ODM\Document
23-
* @ApiFilter (ExistsFilter::class, properties={"nameConverted"})
2423
*/
24+
#[ApiFilter(ExistsFilter::class, properties: ['nameConverted'])]
2525
#[ApiResource]
2626
class ConvertedString
2727
{

‎tests/Fixtures/TestBundle/Document/CustomMultipleIdentifierDummy.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class CustomMultipleIdentifierDummy
3838
*
3939
* @ODM\Field(type="int")
4040
*/
41-
#[ApiProperty(identifier: true)
41+
#[ApiProperty(identifier: true)]
4242
private ?int $secondId = null;
4343

4444
/**

‎tests/Fixtures/TestBundle/Document/DummyCar.php‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
namespace ApiPlatform\Tests\Fixtures\TestBundle\Document;
1515

16-
use ApiPlatform\Core\Annotation\ApiFilter;
1716
use ApiPlatform\Doctrine\Odm\Filter\BooleanFilter;
1817
use ApiPlatform\Doctrine\Odm\Filter\DateFilter;
1918
use ApiPlatform\Doctrine\Odm\Filter\SearchFilter;
19+
use ApiPlatform\Metadata\ApiFilter;
2020
use ApiPlatform\Metadata\ApiResource;
2121
use ApiPlatform\Metadata\Delete;
2222
use ApiPlatform\Metadata\Get;
@@ -31,12 +31,12 @@
3131

3232
/**
3333
* @ODM\Document
34-
* @ApiFilter (DateFilter::class, strategy=DateFilter::EXCLUDE_NULL)
35-
* @ApiFilter (BooleanFilter::class)
36-
* @ApiFilter (PropertyFilter::class, arguments={"parameterName"="foobar"})
37-
* @ApiFilter (GroupFilter::class, arguments={"parameterName"="foobargroups"})
38-
* @ApiFilter (GroupFilter::class, arguments={"parameterName"="foobargroups_override"}, id="override")
3934
*/
35+
#[ApiFilter(DateFilter::class, strategy: DateFilter::EXCLUDE_NULL)]
36+
#[ApiFilter(BooleanFilter::class)]
37+
#[ApiFilter(PropertyFilter::class, arguments: ['parameterName' => 'foobar'])]
38+
#[ApiFilter(GroupFilter::class, arguments: ['parameterName' => 'foobargroups'])]
39+
#[ApiFilter(GroupFilter::class, arguments: ['parameterName' => 'foobargroups_override'], id: 'override')]
4040
#[ApiResource(operations: [new Get(openapiContext: ['tags' => []]), new Put(), new Delete(), new Post(), new GetCollection()], sunset: '2050-01-01', normalizationContext: ['groups' => ['colors']])]
4141
class DummyCar
4242
{
@@ -50,42 +50,38 @@ class DummyCar
5050
* @var mixed Something else
5151
*
5252
* @ODM\ReferenceMany(targetDocument=DummyCarColor::class, mappedBy="car")
53-
*
54-
* @ApiFilter(SearchFilter::class, properties={"colors.prop"="ipartial", "colors"="exact"})
5553
*/
54+
#[ApiFilter(SearchFilter::class, properties: ['colors.prop' => 'ipartial', 'colors' => 'exact'])]
5655
#[Serializer\Groups(['colors'])]
5756
private $colors;
5857
/**
5958
* @var mixed Something else
6059
*
6160
* @ODM\ReferenceMany(targetDocument=DummyCarColor::class, mappedBy="car")
62-
*
63-
* @ApiFilter(SearchFilter::class, strategy="exact")
6461
*/
62+
#[ApiFilter(SearchFilter::class, strategy: 'exact')]
6563
#[Serializer\Groups(['colors'])]
66-
private ?mixed $secondColors = null;
64+
private mixed $secondColors = null;
6765
/**
6866
* @var mixed Something else
6967
*
7068
* @ODM\ReferenceMany(targetDocument=DummyCarColor::class, mappedBy="car")
71-
*
72-
* @ApiFilter(SearchFilter::class, strategy="exact")
7369
*/
70+
#[ApiFilter(SearchFilter::class, strategy: 'exact')]
7471
#[Serializer\Groups(['colors'])]
75-
private ?mixed $thirdColors = null;
72+
private mixed $thirdColors = null;
7673
/**
7774
* @var mixed Something else
7875
*
7976
* @ODM\ReferenceMany(targetDocument=UuidIdentifierDummy::class)
80-
*
81-
* @ApiFilter(SearchFilter::class, strategy="exact")
8277
*/
78+
#[ApiFilter(SearchFilter::class, strategy: 'exact')]
8379
#[Serializer\Groups(['colors'])]
84-
private ?mixed $uuid = null;
80+
private mixed $uuid = null;
8581
/**
8682
* @ODM\Field(type="string")
87-
* @ApiFilter(SearchFilter::class, strategy="partial")
8883
*/
84+
#[ApiFilter(SearchFilter::class, strategy: 'partial')]
8985
private ?string $name = null;
9086
/**
9187
* @ODM\Field(type="bool")

‎tests/Fixtures/TestBundle/Document/DummyCarColor.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
namespace ApiPlatform\Tests\Fixtures\TestBundle\Document;
1515

16-
use ApiPlatform\Core\Annotation\ApiFilter;
1716
use ApiPlatform\Doctrine\Odm\Filter\SearchFilter;
17+
use ApiPlatform\Metadata\ApiFilter;
1818
use ApiPlatform\Metadata\ApiResource;
1919
use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
2020
use Symfony\Component\Serializer\Annotation as Serializer;
@@ -39,8 +39,8 @@ class DummyCarColor
3939
private ?\ApiPlatform\Tests\Fixtures\TestBundle\Document\DummyCar $car = null;
4040
/**
4141
* @ODM\Field(nullable=false)
42-
* @ApiFilter(SearchFilter::class)
4342
*/
43+
#[ApiFilter(SearchFilter::class)]
4444
#[Assert\NotBlank]
4545
#[Serializer\Groups(['colors'])]
4646
private string $prop = '';

‎tests/Fixtures/TestBundle/Document/DummyDate.php‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,25 @@
1313

1414
namespace ApiPlatform\Tests\Fixtures\TestBundle\Document;
1515

16-
use ApiPlatform\Core\Annotation\ApiFilter;
1716
use ApiPlatform\Doctrine\Odm\Filter\DateFilter;
1817
use ApiPlatform\Doctrine\Odm\Filter\SearchFilter;
18+
use ApiPlatform\Metadata\ApiFilter;
1919
use ApiPlatform\Metadata\ApiResource;
2020
use ApiPlatform\Metadata\Get;
2121
use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
2222

2323
/**
2424
* Dummy Date.
2525
*
26-
* @author Antoine Bluchet <[email protected]>
2726
* @author Alan Poulain <[email protected]>
28-
* @ApiFilter (SearchFilter::class, properties={"dummyDate"})
29-
* @ApiFilter (DateFilter::class, properties={
30-
* "dateIncludeNullAfter"=DateFilter::INCLUDE_NULL_AFTER,
31-
* "dateIncludeNullBefore"=DateFilter::INCLUDE_NULL_BEFORE,
32-
* "dateIncludeNullBeforeAndAfter"=DateFilter::INCLUDE_NULL_BEFORE_AND_AFTER
33-
* })
3427
* @ODM\Document
3528
*/
29+
#[ApiFilter(DateFilter::class, properties: [
30+
'dateIncludeNullAfter' => DateFilter::INCLUDE_NULL_AFTER,
31+
'dateIncludeNullBefore' => DateFilter::INCLUDE_NULL_BEFORE,
32+
'dateIncludeNullBeforeAndAfter' => DateFilter::INCLUDE_NULL_BEFORE_AND_AFTER,
33+
])]
34+
#[ApiFilter(SearchFilter::class, properties: ['dummyDate'])]
3635
#[ApiResource(filters: ['my_dummy_date.mongodb.date'])]
3736
class DummyDate
3837
{

0 commit comments

Comments
 (0)