Bump to Symfony 3.4

llupa · Jul 2, 2019 · a228f8b · a228f8b
1 parent a04b0a9
commit a228f8b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 20 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -22,7 +22,6 @@ public function getConfigTreeBuilder()
 
         $rootNode
             ->children()
-              ->scalarNode('form_type')->defaultValue('Solution\CodeMirrorBundle\Form\Type\CodeMirrorType')->end()
               ->scalarNode('twig_extension')->defaultValue('Solution\CodeMirrorBundle\Twig\CodeMirrorExtension')->end()
               ->arrayNode('parameters')
                 ->prototype('scalar')->end()

diff --git a/DependencyInjection/SolutionCodeMirrorExtension.php b/DependencyInjection/SolutionCodeMirrorExtension.php
@@ -22,7 +22,6 @@ public function load(array $configs, ContainerBuilder $container)
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $container->setParameter('code_mirror.form_type', $config['form_type']);
         $container->setParameter('code_mirror.parameters', $config['parameters']);
         $container->setParameter('code_mirror.twig.extension', $config['twig_extension']);
         $container->setParameter('code_mirror.mode_dirs', $config['mode_dirs']);

diff --git a/Form/Type/CodeMirrorType.php b/Form/Type/CodeMirrorType.php
@@ -3,11 +3,12 @@
 namespace Solution\CodeMirrorBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class CodeMirrorType extends AbstractType
+final class CodeMirrorType extends AbstractType
 {
     /**
      * @var array
@@ -30,27 +31,29 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
-       $resolver->setDefaults(
-           array(
-               'parameters' => $this->parameters
-           )
-       );
+        $resolver->setDefaults(
+            array(
+                'parameters' => $this->parameters
+            )
+        );
     }
 
     /**
      * {@inheritdoc}
      */
     public function getParent()
     {
-        return 'textarea';
+        return TextareaType::class;
     }
 
     /**
-     * {@inheritdoc}
+     * Keep this to use same widget.
+     *
+     * @return string
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'code_mirror';
     }

diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -1,13 +1,12 @@
 services:
     code_mirror.asset_manager:
         class: Solution\CodeMirrorBundle\Asset\AssetManager
-        arguments: ["@file_locator", %code_mirror.mode_dirs%, %code_mirror.themes_dirs%,  %kernel.cache_dir%, %kernel.environment%]
+        arguments: ["@file_locator", '%code_mirror.mode_dirs%', '%code_mirror.themes_dirs%',  '%kernel.cache_dir%', '%kernel.environment%']
 
-    code_mirror.form.type:
-        class: %code_mirror.form_type%
-        arguments: [%code_mirror.parameters%]
+    Solution\CodeMirrorBundle\Form\Type\CodeMirrorType:
+        arguments: ['%code_mirror.parameters%']
         tags:
-            - { name: form.type, alias: code_mirror }
+            - { name: form.type }
 
     code_mirror.twig.extension:
         class: Solution\CodeMirrorBundle\Twig\CodeMirrorExtension

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "nitrado/code-mirror-bundle",
-    "description": "This Bundle integrates CodeMirror editor into a Symfony2 project.",
+    "description": "This Bundle integrates CodeMirror editor into a Symfony project.",
     "keywords": ["codemirror", "php editor", "html editor", "editor"],
     "type": "symfony-bundle",
     "license": "MIT",
@@ -14,11 +14,14 @@
             "name": "Aaron Mueller",
             "homepage": "http://marbis.net/",
             "email": "[email protected]"
+        },
+        {
+            "name": "llupa"
         }
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/symfony": "~2.3|~3.0",
+        "symfony/symfony": "~3.4",
         "twig/twig": "*",
         "symfony/assetic-bundle": "*",
         "zendframework/zend-json": "2.0.*"