From ab9735decb973ba12f3fbd310fb2f5fcb76ff13e Mon Sep 17 00:00:00 2001
From: Jose Juan Monagas Santana <jose@wupplier.com>
Date: Sat, 18 Nov 2017 11:35:53 +0200
Subject: [PATCH] Added dependencies for Symfony4 in composer.json Including
 2.8 - 3.0 and 4.0 travis tests Modified public services configuration with
 Symfony4 support

---
 .travis.yml                       | 14 ++++++++++++++
 composer.json                     |  8 ++++----
 src/Resources/config/services.yml | 20 +++++++++++---------
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d11370b..c4df632 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
 
diff --git a/composer.json b/composer.json
index f4abff6..1797db3 100644
--- a/composer.json
+++ b/composer.json
@@ -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"
diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
index 8d93695..034470b 100644
--- a/src/Resources/config/services.yml
+++ b/src/Resources/config/services.yml
@@ -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%'
@@ -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' }