From 5f3ea86c695fd7cf31c2d6964c699df5b0143211 Mon Sep 17 00:00:00 2001 From: reinbaarsma Date: Mon, 13 Nov 2017 14:31:57 +0100 Subject: [PATCH 1/3] updated knplabs/knp-gaufrette-bundle to version that supports symfonyr3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b0ba934..be2f466 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "symfony/validator": ">=2.1 | >=2.3", "imagine/Imagine": "<=0.5", "doctrine/orm": "*", - "knplabs/knp-gaufrette-bundle": "v0.1.7", + "knplabs/knp-gaufrette-bundle": "^0.3.0", "symfony/finder": ">=2.1" }, From eb6d10a9aa57141f200275ee5fbfd51e3f84424f Mon Sep 17 00:00:00 2001 From: reinbaarsma Date: Tue, 14 Nov 2017 16:00:38 +0100 Subject: [PATCH 2/3] some more fixes for Symfony 3.4 --- .../DataTransformer/BaseFileToStringTransformer.php | 3 ++- Form/Type/DelFileType.php | 13 +++++++++++-- Form/Type/FileType.php | 13 +++++++++++-- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/Form/DataTransformer/BaseFileToStringTransformer.php b/Form/DataTransformer/BaseFileToStringTransformer.php index be6883e..ddaf24b 100644 --- a/Form/DataTransformer/BaseFileToStringTransformer.php +++ b/Form/DataTransformer/BaseFileToStringTransformer.php @@ -27,7 +27,8 @@ class BaseFileToStringTransformer implements DataTransformerInterface */ public function transform($data) { - return ($data instanceof BaseFileInterface) ? (string) $data->getPath() : null; + $file = new \Symfony\Component\HttpFoundation\File\File($data->getPath(), false); + return ($data instanceof BaseFileInterface) ? $file : null; } /** diff --git a/Form/Type/DelFileType.php b/Form/Type/DelFileType.php index a46af32..09d1314 100644 --- a/Form/Type/DelFileType.php +++ b/Form/Type/DelFileType.php @@ -13,6 +13,7 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\Form\Extension\Core\Type\CheckboxType; /** * @author Valentin Ferriere @@ -43,14 +44,22 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) */ public function getParent() { - return 'checkbox'; + return CheckboxType::class; } /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'vlabs_del_file'; } + + /** + * Backwards compatability for Symfony < 2.7 + */ + public function getName() + { + return $this->getBlockPrefix(); + } } diff --git a/Form/Type/FileType.php b/Form/Type/FileType.php index 636f79d..ed327a3 100644 --- a/Form/Type/FileType.php +++ b/Form/Type/FileType.php @@ -19,6 +19,7 @@ use Vlabs\MediaBundle\Form\DataTransformer\BaseFileToStringTransformer; use Vlabs\MediaBundle\EventListener\BaseFileListener; use Vlabs\MediaBundle\Handler\HandlerManager; +use Symfony\Component\Form\Extension\Core\Type\FileType as BaseFileType; /** * @author Valentin Ferriere @@ -71,14 +72,22 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) */ public function getParent() { - return 'file'; + return BaseFileType::class; } /** * {@inheritdoc} */ - public function getName() + public function getBlockPrefix() { return 'vlabs_file'; } + + /** + * Backwards compatability for Symfony < 2.7 + */ + public function getName() + { + return $this->getBlockPrefix(); + } } From 96cb6dac944ab8c8e3985a5a3eb3bf70119226cb Mon Sep 17 00:00:00 2001 From: reinbaarsma Date: Tue, 14 Nov 2017 16:03:05 +0100 Subject: [PATCH 3/3] some more fixes for Symfony 3.4 --- Form/DataTransformer/BaseFileToStringTransformer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Form/DataTransformer/BaseFileToStringTransformer.php b/Form/DataTransformer/BaseFileToStringTransformer.php index ddaf24b..1def110 100644 --- a/Form/DataTransformer/BaseFileToStringTransformer.php +++ b/Form/DataTransformer/BaseFileToStringTransformer.php @@ -13,6 +13,7 @@ use Symfony\Component\Form\DataTransformerInterface; use Vlabs\MediaBundle\Entity\BaseFileInterface; +use Symfony\Component\HttpFoundation\File\File; /** * Return the path in the form view data. @@ -27,8 +28,7 @@ class BaseFileToStringTransformer implements DataTransformerInterface */ public function transform($data) { - $file = new \Symfony\Component\HttpFoundation\File\File($data->getPath(), false); - return ($data instanceof BaseFileInterface) ? $file : null; + return ($data instanceof BaseFileInterface) ? new File($data->getPath(), false) : null; } /**