Skip to content

Commit

Permalink
Merge pull request #187 from jjmonagas/feature-upgrade-sf4
Browse files Browse the repository at this point in the history
Adding Symfony4 support
  • Loading branch information
excelwebzone authored Nov 19, 2017
2 parents 5987296 + ab9735d commit c342888
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 13 deletions.
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,21 @@ php:
- 7.0
- 7.1

matrix:
fast_finish: true
include:
# test 2.8 LTS
- php: 5.6
env: SYMFONY_VERSION=2.8.*
# test the latest stable 3.x release
- php: 5.6
env: SYMFONY_VERSION=^3.0
# test the latest release (including beta releases)
- php: 7.1
env: DEPENDENCIES=beta

before_script:
- if [ "$DEPENDENCIES" = "beta" ]; then composer config minimum-stability beta; fi;
- composer self-update
- composer install

Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
}
],
"require": {
"php": ">=5.6",
"symfony/form": "^2.8 || ^3.0",
"symfony/validator": "^2.8 || ^3.0",
"symfony/framework-bundle": "^2.8 || ^3.0"
"php": ">=5.6 || ^7.0",
"symfony/form": "^2.8 || ^3.0 || ^4.0",
"symfony/validator": "^2.8 || ^3.0 || ^4.0",
"symfony/framework-bundle": "^2.8 || ^3.0 || ^4.0"
},
"require-dev": {
"phpunit/phpunit": "~5.3"
Expand Down
20 changes: 11 additions & 9 deletions src/Resources/config/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ services:

ewz_recaptcha.form.type:
class: EWZ\Bundle\RecaptchaBundle\Form\Type\EWZRecaptchaType
public: true
arguments:
- '%ewz_recaptcha.public_key%'
- '%ewz_recaptcha.enabled%'
Expand All @@ -18,12 +19,13 @@ services:
- { name: form.type }

ewz_recaptcha.validator.true:
class: EWZ\Bundle\RecaptchaBundle\Validator\Constraints\IsTrueValidator
arguments:
- '%ewz_recaptcha.enabled%'
- '%ewz_recaptcha.private_key%'
- '@request_stack'
- '%ewz_recaptcha.http_proxy%'
- '%ewz_recaptcha.verify_host%'
tags:
- { name: validator.constraint_validator, alias: 'ewz_recaptcha.true' }
class: EWZ\Bundle\RecaptchaBundle\Validator\Constraints\IsTrueValidator
public: true
arguments:
- '%ewz_recaptcha.enabled%'
- '%ewz_recaptcha.private_key%'
- '@request_stack'
- '%ewz_recaptcha.http_proxy%'
- '%ewz_recaptcha.verify_host%'
tags:
- { name: validator.constraint_validator, alias: 'ewz_recaptcha.true' }

0 comments on commit c342888

Please sign in to comment.