Skip to content

Commit

Permalink
Merge pull request #33 from martin-georgiev/feature/symfony-4
Browse files Browse the repository at this point in the history
Support for Symfony 4
  • Loading branch information
rdohms authored Dec 13, 2017
2 parents 378585f + c5d9167 commit 3581a5c
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
16 changes: 16 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,27 @@ matrix:
env: SYMFONY_VERSION=3.0.*
- php: 5.6
env: SYMFONY_VERSION=^3
- php: 7.0
env: SYMFONY_VERSION=2.8.*
- php: 7.0
env: SYMFONY_VERSION=3.0.*
- php: 7.0
env: SYMFONY_VERSION=^3
- php: 7.1
env: SYMFONY_VERSION=3.0.*
- php: 7.1
env: SYMFONY_VERSION=^3
- php: 7.1
env: SYMFONY_VERSION=^4
- php: 7.1
env: SYMFONY_VERSION=dev-master@dev
- php: 7.2
env: SYMFONY_VERSION=3.0.*
- php: 7.2
env: SYMFONY_VERSION=^3
- php: 7.2
env: SYMFONY_VERSION=^4
- php: 7.2
env: SYMFONY_VERSION=dev-master@dev
allow_failures:
- env: SYMFONY_VERSION=dev-master@dev
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"require": {
"php": "^5.6|^7",
"dms/dms-filter": "^2.0 | ^3.0",
"symfony/symfony": "^2.8 | ^3"
"symfony/symfony": "^2.8 | ^3.0 | ^4.0"
},

"require-dev": {
Expand Down
4 changes: 4 additions & 0 deletions src/DMS/Bundle/FilterBundle/Resources/config/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ services:

dms.filter:
class: DMS\Bundle\FilterBundle\Service\Filter
public: true
arguments:
- '@dms.filter.inner.filter'

dms.filter.type_extension:
class: DMS\Bundle\FilterBundle\Form\Type\FormTypeFilterExtension
public: true
arguments:
- '@dms.filter'
- '%dms_filter.auto_filter_forms%'
Expand All @@ -25,6 +27,7 @@ services:

dms.filter.mapping.loader:
class: '%dms.filter.mapping.loader.class%'
public: true
arguments:
- '@annotation_reader'

Expand All @@ -41,5 +44,6 @@ services:

dms.filter.container_filter:
class: DMS\Bundle\FilterBundle\Filter\ContainerFilter
public: true
calls:
- [setContainer, ['@service_container']]

0 comments on commit 3581a5c

Please sign in to comment.