diff --git a/composer.json b/composer.json index aa97d9f..dab45fe 100755 --- a/composer.json +++ b/composer.json @@ -19,8 +19,8 @@ "require": { "php": ">=5.5.9", - "symfony/form": "^2.7|^3.0|^4.0", - "symfony/validator": "^2.7|^3.0|^4.0" + "symfony/form": "^2.7|^3.0|^4.0|^5.0", + "symfony/validator": "^2.7|^3.0|^4.0|^5.0" }, "require-dev": { "php": "^7.1.3", diff --git a/src/Factory/JsFormValidatorFactory.php b/src/Factory/JsFormValidatorFactory.php index 79c78d8..e2ddefa 100755 --- a/src/Factory/JsFormValidatorFactory.php +++ b/src/Factory/JsFormValidatorFactory.php @@ -11,7 +11,7 @@ use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Form; use Symfony\Component\Form\FormInterface; -use Symfony\Component\Translation\TranslatorInterface; +use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Mapping\ClassMetadata; use Symfony\Component\Validator\Mapping\GetterMetadata; diff --git a/src/Form/Extension/FormExtension.php b/src/Form/Extension/FormExtension.php index 11bd771..8c846d1 100755 --- a/src/Form/Extension/FormExtension.php +++ b/src/Form/Extension/FormExtension.php @@ -58,7 +58,7 @@ public function getExtendedType() /** * {@inheritDoc} */ - public static function getExtendedTypes() + public static function getExtendedTypes(): iterable { yield FormType::class; } diff --git a/src/Twig/Extension/JsFormValidatorTwigExtension.php b/src/Twig/Extension/JsFormValidatorTwigExtension.php index a1f16fa..9929ca4 100755 --- a/src/Twig/Extension/JsFormValidatorTwigExtension.php +++ b/src/Twig/Extension/JsFormValidatorTwigExtension.php @@ -4,13 +4,15 @@ use Fp\JsFormValidatorBundle\Factory\JsFormValidatorFactory; use Symfony\Component\Form\FormView; +use Twig\Extension\AbstractExtension; +use Twig\TwigFunction; /** * Class JsFormValidatorTwigExtension * * @package Fp\JsFormValidatorBundle\Twig\Extension */ -class JsFormValidatorTwigExtension extends \Twig_Extension +class JsFormValidatorTwigExtension extends AbstractExtension { /** * @var JsFormValidatorFactory @@ -42,10 +44,10 @@ public function __construct(JsFormValidatorFactory $factory) public function getFunctions() { return array( - new \Twig_SimpleFunction('init_js_validation', array($this, 'getJsValidator'), array( + new TwigFunction('init_js_validation', array($this, 'getJsValidator'), array( 'is_safe' => array('html') )), - new \Twig_SimpleFunction('js_validator_config', array($this, 'getConfig'), array( + new TwigFunction('js_validator_config', array($this, 'getConfig'), array( 'is_safe' => array('html') )), );