Added different versions for phpunit and fixed tests

Author: Manuele Vaccari

composer.json

@@ -1,35 +1,36 @@
 {
-  "name": "excelwebzone/recaptcha-bundle",
-  "description": "This bundle provides easy reCAPTCHA form field integration",
-  "keywords": ["recaptcha"],
-  "homepage": "https://github.com/excelwebzone/EWZRecaptchaBundle",
-  "type": "symfony-bundle",
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "Michael H. Arieli",
-      "email": "excelwebzone@gmail.com",
-      "homepage": "http://excelwebzone.com/"
+    "name": "excelwebzone/recaptcha-bundle",
+    "description": "This bundle provides easy reCAPTCHA form field integration",
+    "keywords": ["recaptcha"],
+    "homepage": "https://github.com/excelwebzone/EWZRecaptchaBundle",
+    "type": "symfony-bundle",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Michael H. Arieli",
+            "email": "excelwebzone@gmail.com",
+            "homepage": "http://excelwebzone.com/"
+        }
+    ],
+    "require": {
+        "php": ">=5.6 || ^7.0",
+        "google/recaptcha": "^1.1",
+        "symfony/form": "^2.8 || ^3.0 || ^4.0",
+        "symfony/security": "^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 || ^6 || ^7"
+    },
+    "autoload": {
+        "psr-4": {
+            "EWZ\\Bundle\\RecaptchaBundle\\": "src"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "EWZ\\Tests\\Bundle\\RecaptchaBundle\\": "tests"
+        }
     }
-  ],
-  "require": {
-    "php": ">=5.6 || ^7.0",
-    "symfony/form": "^2.8 || ^3.0 || ^4.0",
-    "symfony/security": "^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"
-  },
-  "autoload": {
-    "psr-4": {
-      "EWZ\\Bundle\\RecaptchaBundle\\": "src"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "EWZ\\Tests\\Bundle\\RecaptchaBundle\\": "tests"
-    }
-  }
 }

phpunit.xml.dist

@@ -1,10 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php" colors="true">
-
-  <testsuites>
-    <testsuite name="EWZRecaptchaBundle">
-      <directory>tests/</directory>
-    </testsuite>
-  </testsuites>
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.0/phpunit.xsd"
+         bootstrap="./tests/bootstrap.php"
+         colors="true">
+
+    <testsuites>
+        <testsuite name="EWZRecaptchaBundle">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
 
 </phpunit>

tests/Form/Type/EWZRecaptchaTypeTest.php

@@ -4,13 +4,14 @@
 
 use EWZ\Bundle\RecaptchaBundle\Form\Type\EWZRecaptchaType;
 use EWZ\Bundle\RecaptchaBundle\Locale\LocaleResolver;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class EWZRecaptchaTypeTest extends \PHPUnit_Framework_TestCase
+class EWZRecaptchaTypeTest extends TestCase
 {
     /** @var EWZRecaptchaType */
     protected $type;

tests/Locale/LocaleResolverTest.php

@@ -3,10 +3,11 @@
 namespace EWZ\Tests\Bundle\RecaptchaBundle\Locale;
 
 use EWZ\Bundle\RecaptchaBundle\Locale\LocaleResolver;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
-class LocaleResolverTest extends \PHPUnit_Framework_TestCase
+class LocaleResolverTest extends TestCase
 {
     /**
      * @test