Skip to content

Add filter locator and deprecate filter collection #1099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dunglas merged 1 commit into from
May 15, 2017
Merged

Add filter locator and deprecate filter collection #1099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@

"doctrine/inflector": "^1.0",
"psr/cache": "^1.0",
"symfony/http-foundation": "^2.7 || ^3.0",
"symfony/http-kernel": "^2.7 || ^3.0",
"psr/container": "^1.0",
"symfony/http-foundation": "^3.3@beta",
"symfony/http-kernel": "^3.3@beta",
"symfony/property-access": "^2.7 || ^3.0",
"symfony/property-info": "^3.1",
"symfony/serializer": "^3.1",
"symfony/property-info": "^3.3@beta",
"symfony/serializer": "^3.3@beta",
"willdurand/negotiation": "^2.0.3"
},
"require-dev": {
Expand All @@ -42,18 +43,23 @@
"phpunit/phpunit": "^5.6.8",
"psr/log": "^1.0",
"sensio/framework-extra-bundle": "^3.0",
"symfony/asset": "^2.7 || ^3.0",
"symfony/cache": "^3.1",
"symfony/config": "^3.2",
"symfony/dependency-injection": "^2.7 || ^3.0",
"symfony/asset": "^3.3@beta",
"symfony/cache": "^3.3@beta",
"symfony/config": "^3.3@beta",
"symfony/console": "^3.3@beta",
"symfony/dependency-injection": "^3.3@beta",
"symfony/doctrine-bridge": "^2.8 || ^3.0",
"symfony/event-dispatcher": "^3.3@beta",
"symfony/expression-language": "^2.8 || ^3.0",
"symfony/finder": "^2.7 || ^3.0",
"symfony/framework-bundle": "^3.1",
"symfony/finder": "^3.3@beta",
"symfony/form": "^3.3@beta",
"symfony/framework-bundle": "^3.3@beta",
"symfony/phpunit-bridge": "^2.7 || ^3.0",
"symfony/routing": "^3.3@beta",
"symfony/security": "^2.7 || ^3.0",
"symfony/twig-bundle": "^2.8 || ^3.1",
"symfony/validator": "^2.7 || ^3.0"
"symfony/validator": "^3.3@beta",
"symfony/yaml": "^3.3@beta"
},
"suggest": {
"friendsofsymfony/user-bundle": "To use the FOSUserBundle bridge.",
Expand Down
120 changes: 60 additions & 60 deletions features/doctrine/date_filter.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,73 +406,67 @@ Feature: Date filter on collections
},
"hydra:search": {
"@type": "hydra:IriTemplate",
"hydra:template": "\/dummies{?id,id[],name,alias,description,relatedDummy.name,relatedDummy.name[],relatedDummies,relatedDummies[],dummy,relatedDummies.name,order[id],order[name],order[relatedDummy.symfony],dummyDate[before],dummyDate[after],relatedDummy.dummyDate[before],relatedDummy.dummyDate[after],dummyFloat[between],dummyFloat[gt],dummyFloat[gte],dummyFloat[lt],dummyFloat[lte],dummyPrice[between],dummyPrice[gt],dummyPrice[gte],dummyPrice[lt],dummyPrice[lte],dummyBoolean,dummyFloat,dummyPrice,description[exists],relatedDummy.name[exists],dummyBoolean[exists]}",
"hydra:template": "/dummies{?dummyBoolean,dummyDate[before],dummyDate[after],relatedDummy.dummyDate[before],relatedDummy.dummyDate[after],description[exists],relatedDummy.name[exists],dummyBoolean[exists],dummyFloat,dummyPrice,order[id],order[name],order[relatedDummy.symfony],dummyFloat[between],dummyFloat[gt],dummyFloat[gte],dummyFloat[lt],dummyFloat[lte],dummyPrice[between],dummyPrice[gt],dummyPrice[gte],dummyPrice[lt],dummyPrice[lte],id,id[],name,alias,description,relatedDummy.name,relatedDummy.name[],relatedDummies,relatedDummies[],dummy,relatedDummies.name}",
"hydra:variableRepresentation": "BasicRepresentation",
"hydra:mapping": [
{
"@type": "IriTemplateMapping",
"variable": "id",
"property": "id",
"variable": "dummyBoolean",
"property": "dummyBoolean",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "id[]",
"property": "id",
"variable": "dummyDate[before]",
"property": "dummyDate",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "name",
"property": "name",
"variable": "dummyDate[after]",
"property": "dummyDate",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "alias",
"property": "alias",
"variable": "relatedDummy.dummyDate[before]",
"property": "relatedDummy.dummyDate",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "description",
"property": "description",
"variable": "relatedDummy.dummyDate[after]",
"property": "relatedDummy.dummyDate",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "relatedDummy.name",
"property": "relatedDummy.name",
"variable": "description[exists]",
"property": "description",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "relatedDummy.name[]",
"variable": "relatedDummy.name[exists]",
"property": "relatedDummy.name",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "relatedDummies",
"property": "relatedDummies",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "relatedDummies[]",
"property": "relatedDummies",
"variable": "dummyBoolean[exists]",
"property": "dummyBoolean",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "dummy",
"property": "dummy",
"variable": "dummyFloat",
"property": "dummyFloat",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "relatedDummies.name",
"property": "relatedDummies.name",
"variable": "dummyPrice",
"property": "dummyPrice",
"required": false
},
{
Expand All @@ -493,30 +487,6 @@ Feature: Date filter on collections
"property": "relatedDummy.symfony",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "dummyDate[before]",
"property": "dummyDate",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "dummyDate[after]",
"property": "dummyDate",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "relatedDummy.dummyDate[before]",
"property": "relatedDummy.dummyDate",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "relatedDummy.dummyDate[after]",
"property": "relatedDummy.dummyDate",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "dummyFloat[between]",
Expand Down Expand Up @@ -579,38 +549,68 @@ Feature: Date filter on collections
},
{
"@type": "IriTemplateMapping",
"variable": "dummyBoolean",
"property": "dummyBoolean",
"variable": "id",
"property": "id",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "dummyFloat",
"property": "dummyFloat",
"variable": "id[]",
"property": "id",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "dummyPrice",
"property": "dummyPrice",
"variable": "name",
"property": "name",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "description[exists]",
"variable": "alias",
"property": "alias",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "description",
"property": "description",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "relatedDummy.name[exists]",
"variable": "relatedDummy.name",
"property": "relatedDummy.name",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "dummyBoolean[exists]",
"property": "dummyBoolean",
"variable": "relatedDummy.name[]",
"property": "relatedDummy.name",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "relatedDummies",
"property": "relatedDummies",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "relatedDummies[]",
"property": "relatedDummies",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "dummy",
"property": "dummy",
"required": false
},
{
"@type": "IriTemplateMapping",
"variable": "relatedDummies.name",
"property": "relatedDummies.name",
"required": false
}
]
Expand Down
10 changes: 5 additions & 5 deletions features/hydra/collection.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,12 +235,12 @@ Feature: Collections support
And the JSON should be valid according to this schema:
"""
{
"@id":"\/dummies?page=3",
"@id":"/dummies?page=3",
"@type":"hydra:PartialCollectionView",
"hydra:first":"\/dummies?page=1",
"hydra:last":"\/dummies?page=10",
"hydra:previous":"\/dummies?page=2",
"hydra:next":"\/dummies?page=4"
"hydra:first":"/dummies?page=1",
"hydra:last":"/dummies?page=10",
"hydra:previous":"/dummies?page=2",
"hydra:next":"/dummies?page=4"
}
"""
Scenario: Filter with exact match
Expand Down
Loading