From efe27098bf140f4a4e8a65bb2ceafdf22c15669c Mon Sep 17 00:00:00 2001
From: Ravindra Khokharia <ravindrakhokharia@gmail.com>
Date: Thu, 10 Jan 2019 18:41:27 +0530
Subject: [PATCH 01/12] Update composer.json

Update dependencies
---
 composer.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 88aee8c6..2a70d548 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "genemu/form-bundle",
+    "name": "prolix/form-bundle",
     "type": "symfony-bundle",
     "description": "Extra form types for your Symfony2 projects",
     "keywords": ["form", "extra form"],
@@ -20,9 +20,9 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/framework-bundle": "~2.8 || ^3.0",
-        "symfony/form": "~2.8 || ^3.0",
-        "twig/twig": "~1.14"
+        "symfony/framework-bundle": "~3.4|~4.0",
+        "symfony/form": "~3.4|~4.0",
+        "twig/twig": "~2.6"
     },
     "suggest": {
         "symfony/twig-bridge": "For integration into Twig templates",

From 73e4d9bf7194027fa5aef94141e2cc176f4ee405 Mon Sep 17 00:00:00 2001
From: savan-tts <savan.vyas@gmail.com>
Date: Tue, 15 Jan 2019 14:58:58 +0530
Subject: [PATCH 02/12] Remove deprecated code

---
 DependencyInjection/GenemuFormExtension.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/DependencyInjection/GenemuFormExtension.php b/DependencyInjection/GenemuFormExtension.php
index e6f54b5b..70529656 100644
--- a/DependencyInjection/GenemuFormExtension.php
+++ b/DependencyInjection/GenemuFormExtension.php
@@ -11,13 +11,13 @@
 
 namespace Genemu\Bundle\FormBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 
 /**
  * GenemuFormExtension.
@@ -227,11 +227,11 @@ private function registerImageConfiguration(array $configs, ContainerBuilder $co
     private function registerAutocompleteConfiguration(array $configs, ContainerBuilder $container)
     {
         $serviceId = 'genemu.form.jquery.type.autocomplete';
-        $textDef = new DefinitionDecorator($serviceId);
+        $textDef = new ChildDefinition($serviceId);
         $textDef->addArgument('text')->addTag('form.type', array('alias' => 'genemu_jqueryautocomplete_text'));
         $container->setDefinition($serviceId . '.text', $textDef);
 
-        $doctrineDef = new DefinitionDecorator($serviceId);
+        $doctrineDef = new ChildDefinition($serviceId);
         $doctrineDef
             ->addArgument('entity')
             ->addArgument(new Reference('doctrine', ContainerInterface::NULL_ON_INVALID_REFERENCE))
@@ -239,7 +239,7 @@ private function registerAutocompleteConfiguration(array $configs, ContainerBuil
         ;
         $container->setDefinition($serviceId . '.entity', $doctrineDef);
 
-        $mongoDef = new DefinitionDecorator($serviceId);
+        $mongoDef = new ChildDefinition($serviceId);
         $mongoDef
             ->addArgument('document')
             ->addArgument(new Reference('doctrine_mongodb', ContainerInterface::NULL_ON_INVALID_REFERENCE))
@@ -254,7 +254,7 @@ private function registerSelect2Configuration(array $configs, ContainerBuilder $
     {
         $serviceId = 'genemu.form.jquery.type.select2';
         foreach (array_merge($this->getChoiceTypeNames(), array('hidden')) as $type) {
-            $typeDef = new DefinitionDecorator($serviceId);
+            $typeDef = new ChildDefinition($serviceId);
             $typeDef
                 ->addArgument($type)
                 ->addArgument($configs['configs'])
@@ -275,7 +275,7 @@ private function registerSelect2Configuration(array $configs, ContainerBuilder $
     private function loadExtendedTypes($serviceId, $name, ContainerBuilder $container)
     {
         foreach ($this->getChoiceTypeNames() as $type) {
-            $typeDef = new DefinitionDecorator($serviceId);
+            $typeDef = new ChildDefinition($serviceId);
             $typeDef->addArgument($type)->addTag('form.type', array('alias' => 'genemu_'.$name.'_'.$type));
 
             $container->setDefinition($serviceId.'.'.$type, $typeDef);

From 147eaf819009739c1e95481af2ff88b1e29fb0b5 Mon Sep 17 00:00:00 2001
From: Ravindra Khokharia <ravindrakhokharia@gmail.com>
Date: Wed, 27 Feb 2019 11:11:09 +0530
Subject: [PATCH 03/12] Update imagine.xml

Captcha service make public true, because  its used in controller
---
 Resources/config/imagine.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/config/imagine.xml b/Resources/config/imagine.xml
index 451425bf..a5d6d27b 100644
--- a/Resources/config/imagine.xml
+++ b/Resources/config/imagine.xml
@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="genemu.gd.captcha" class="Genemu\Bundle\FormBundle\Gd\Type\Captcha">
+        <service id="genemu.gd.captcha" class="Genemu\Bundle\FormBundle\Gd\Type\Captcha" public="true">
             <argument type="service" id="session" />
             <argument>%kernel.secret%</argument>
         </service>

From ee5906fa86543b4025b66995bf78e152e9e45724 Mon Sep 17 00:00:00 2001
From: Ravindra Khokharia <ravindrakhokharia@gmail.com>
Date: Sat, 14 Dec 2019 17:42:23 +0530
Subject: [PATCH 04/12] SF5 - Supported

---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 2a70d548..ad5e7e6a 100644
--- a/composer.json
+++ b/composer.json
@@ -20,9 +20,9 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/framework-bundle": "~3.4|~4.0",
-        "symfony/form": "~3.4|~4.0",
-        "twig/twig": "~2.6"
+        "symfony/framework-bundle": "~3.4|~4.0||~5.0",
+        "symfony/form": "~3.4|~4.0|~5.0",
+        "twig/twig": "3.0.*"
     },
     "suggest": {
         "symfony/twig-bridge": "For integration into Twig templates",

From 115f33504e4ba1f71261bcad0d5701adff797a0c Mon Sep 17 00:00:00 2001
From: Ravindra Khokharia <ravindrakhokharia@gmail.com>
Date: Mon, 16 Dec 2019 15:25:26 +0530
Subject: [PATCH 05/12] SF-5 Supported

---
 DependencyInjection/Configuration.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 75a64065..0922cdb9 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -30,8 +30,8 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('genenu_form');
+        $treeBuilder = new TreeBuilder('genenu_form');
+        $rootNode = $treeBuilder->getRootNode();
 
         $this->addCaptcha($rootNode);
         $this->addRecaptcha($rootNode);

From 6d7664320e2d30d4cdf78fd5202bf902766a7a71 Mon Sep 17 00:00:00 2001
From: Ravindra Khokharia <ravindrakhokharia@gmail.com>
Date: Tue, 17 Dec 2019 15:57:28 +0530
Subject: [PATCH 06/12] SF5 - Supported

---
 Twig/Extension/FormExtension.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Twig/Extension/FormExtension.php b/Twig/Extension/FormExtension.php
index 3eed70ea..b6ec8243 100644
--- a/Twig/Extension/FormExtension.php
+++ b/Twig/Extension/FormExtension.php
@@ -13,13 +13,14 @@
 
 use Symfony\Component\Form\FormView;
 use Symfony\Bridge\Twig\Form\TwigRendererInterface;
+use Twig\Extension\AbstractExtension;
 
 /**
  * FormExtension extends Twig with form capabilities.
  *
  * @author Olivier Chauvel <olivier@generation-multiple.com>
  */
-class FormExtension extends \Twig_Extension
+class FormExtension extends AbstractExtension
 {
     /**
      * This property is public so that it can be accessed directly from compiled

From ba9580a29abdc5817259f8d5f63e17fc54ba83d5 Mon Sep 17 00:00:00 2001
From: ravindrakhokharia <ravindrakhokharia@gmail.com>
Date: Wed, 18 Dec 2019 11:26:38 +0530
Subject: [PATCH 07/12] SF5 Supported

---
 DependencyInjection/Compiler/FormPass.php     |  2 +-
 Resources/views/Form/div_layout.html.twig     | 24 ---------------
 Resources/views/Form/jquery_layout.html.twig  | 30 -------------------
 .../views/Form/stylesheet_layout.html.twig    |  8 -----
 4 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/DependencyInjection/Compiler/FormPass.php b/DependencyInjection/Compiler/FormPass.php
index 8862755f..d46d3b5f 100644
--- a/DependencyInjection/Compiler/FormPass.php
+++ b/DependencyInjection/Compiler/FormPass.php
@@ -29,7 +29,7 @@ public function process(ContainerBuilder $container)
         $resources = $container->getParameter('twig.form.resources');
 
         foreach (array('div', 'jquery', 'stylesheet') as $template) {
-            $resources[] = 'GenemuFormBundle:Form:' . $template . '_layout.html.twig';
+            $resources[] = '@GenemuForm/Form/' . $template . '_layout.html.twig';
         }
 
         $container->setParameter('twig.form.resources', $resources);
diff --git a/Resources/views/Form/div_layout.html.twig b/Resources/views/Form/div_layout.html.twig
index eb707510..cd96818d 100644
--- a/Resources/views/Form/div_layout.html.twig
+++ b/Resources/views/Form/div_layout.html.twig
@@ -1,12 +1,9 @@
 {% block genemu_captcha_widget %}
-{% spaceless %}
     <img src="{{ src }}" width="{{ width }}" height="{{ height }}" title="{{ name|trans }}" alt="{{ name|trans }}" />
     {{ block("form_widget_simple") }}
-{% endspaceless %}
 {% endblock %}
 
 {% block genemu_recaptcha_widget %}
-{% spaceless %}
     <div id="{{ id }}_div" style="display: none;"></div>
     <noscript>
         <iframe src="http://www.google.com/recaptcha/api/noscript?k={{ public_key }}" width="500" height="300" frameborder="0"></iframe>
@@ -14,11 +11,9 @@
         <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
         <input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
     </noscript>
-{% endspaceless %}
 {% endblock genemu_recaptcha_widget %}
 
 {% block genemu_jquerydate_widget %}
-{% spaceless %}
     {% if widget == "single_text" %}
         {{ block("form_widget_simple") }}
     {% else %}
@@ -36,59 +31,47 @@
             {{ block("hidden_widget") }}
         </div>
     {% endif %}
-{% endspaceless %}
 {% endblock genemu_jquerydate_widget %}
 
 {% block genemu_jqueryslider_widget %}
-{% spaceless %}
     {{ block("hidden_widget") }}
     <div id="{{ id }}_slider"></div>
-{% endspaceless %}
 {% endblock genemu_jqueryslider_widget %}
 
 {% block genemu_jqueryautocompleter_widget %}
-{% spaceless %}
     {{ block("hidden_widget") }}
 
     {% set id = "autocompleter_" ~ id %}
     {% set full_name = "autocompleter_" ~ full_name %}
     {% set value = autocompleter_value %}
     {{ block("form_widget_simple") }}
-{% endspaceless %}
 {% endblock genemu_jqueryautocompleter_widget %}
 
 {% block genemu_jquerychosen_widget %}
-{% spaceless %}
     {% set attr = {
         "data-placeholder": empty_value,
         "class": "chzn-select"
     }|merge(attr) %}
     {{ block("choice_widget") }}
-{% endspaceless %}
 {% endblock genemu_jquerychosen_widget %}
 
 {% block genemu_jquerygeolocation_widget %}
-{% spaceless %}
     {{ form_rest(form) }}
 
     {% if map is same as(true) %}
         <div id="{{ id }}_map">&nbsp;</div>
     {% endif %}
-{% endspaceless %}
 {% endblock genemu_jquerygeolocation_widget %}
 
 {% block genemu_jqueryfile_widget %}
-{% spaceless %}
     {{ block("hidden_widget") }}
     <div id="{{ id }}_upload"></div>
     <div class="queue">
         <div id="{{ id }}_queue"></div>
     </div>
-{% endspaceless %}
 {% endblock genemu_jqueryfile_widget %}
 
 {% block genemu_jquerycolor_widget %}
-{% spaceless %}
     {% if widget == "image" %}
         <div id="{{ id }}_color" {{ block("widget_container_attributes") }}>
             <div{% if value %} style="background-color: #{{ value }};"{% endif %}>&nbsp;</div>
@@ -97,21 +80,17 @@
     {% else %}
         {{ block("form_widget_simple") }}
     {% endif %}
-{% endspaceless %}
 {% endblock genemu_jquerycolor_widget %}
 
 {% block genemu_jqueryrating_widget %}
-{% spaceless %}
     <div {{ block("widget_container_attributes") }}>
     {% for child in form %}
         {{ form_widget(child) }}
     {% endfor %}
     </div>
-{% endspaceless %}
 {% endblock genemu_jqueryrating_widget %}
 
 {% block genemu_jqueryimage_widget %}
-{% spaceless %}
     <div id="{{ id }}_container">
         <div class="left">
             <div id="{{ id }}_preview">
@@ -145,18 +124,15 @@
             </div>
         </div>
     </div>
-{% endspaceless %}
 {% endblock genemu_jqueryimage_widget %}
 
 {% block genemu_jquerytokeninput_widget %}
-{% spaceless %}
 {{ block("hidden_widget") }}
 
 {% set id = "tokeninput_" ~ id %}
 {% set full_name = "tokeninput_" ~ full_name %}
 {% set value = tokeninput_value %}
 {{ block("form_widget_simple") }}
-{% endspaceless %}
 {% endblock genemu_jquerytokeninput_widget %}
 
 {% block genemu_plain_widget %}
diff --git a/Resources/views/Form/jquery_layout.html.twig b/Resources/views/Form/jquery_layout.html.twig
index a1ddc577..87f68afc 100644
--- a/Resources/views/Form/jquery_layout.html.twig
+++ b/Resources/views/Form/jquery_layout.html.twig
@@ -1,9 +1,7 @@
 {% block form_javascript %}
-{% spaceless %}
     {% for child in form %}
         {{ form_javascript(child) }}
     {% endfor %}
-{% endspaceless %}
 {% endblock form_javascript %}
 
 {% block field_javascript "" %}
@@ -11,7 +9,6 @@
 {% block button_javascript "" %}
 
 {% block genemu_captcha_javascript %}
-{% spaceless %}
     <!--[if lte IE 7]>
     <script type="text/javascript">
         $(function () {
@@ -27,11 +24,9 @@
         });
     </script>
     <![endif]-->
-{% endspaceless %}
 {% endblock genemu_captcha_javascript %}
 
 {% block genemu_recaptcha_javascript %}
-{% spaceless %}
     <script type="text/javascript" src="{{ asset("https://www.google.com/recaptcha/api/js/recaptcha_ajax.js") }}"></script>
     <script type="text/javascript">
         function genemu_recaptcha_load()
@@ -47,11 +42,9 @@
             window.onload = genemu_recaptcha_load;
         }
     </script>
-{% endspaceless %}
 {% endblock genemu_recaptcha_javascript %}
 
 {% block genemu_tinymce_javascript %}
-{% spaceless %}
     {% if configs.script_url is defined %}
         {% set configs = configs|merge({
             "script_url": asset(configs.script_url)
@@ -83,11 +76,9 @@
 
         });
     </script>
-{% endspaceless %}
 {% endblock genemu_tinymce_javascript %}
 
 {% block genemu_jquerydate_javascript %}
-{% spaceless %}
     <script type="text/javascript">
         jQuery(document).ready(function($) {
             $field = $('#{% if widget != "single_text" %}datepicker_{% endif %}{{ id }}');
@@ -125,11 +116,9 @@
         {% endblock %}
         });
     </script>
-{% endspaceless %}
 {% endblock %}
 
 {% block genemu_jqueryslider_javascript %}
-{% spaceless %}
     <script type="text/javascript">
         jQuery(document).ready(function($) {
             var $field = $('#{{ id }}');
@@ -143,11 +132,9 @@
             $('#{{ id }}_slider').slider($configs);
         });
     </script>
-{% endspaceless %}
 {% endblock genemu_jqueryslider_javascript %}
 
 {% block genemu_jquerycolor_javascript %}
-{% spaceless %}
     <script type="text/javascript">
         jQuery(document).ready(function($) {
             var $field = $('#{{ id }}');
@@ -181,21 +168,17 @@
         {% endif %}
         });
     </script>
-{% endspaceless %}
 {% endblock genemu_jquerycolor_javascript %}
 
 {% block genemu_jqueryrating_javascript %}
-{% spaceless %}
     <script type="text/javascript">
         jQuery(document).ready(function($) {
             $('[name="{{ full_name }}"]').rating({{ configs|json_encode|raw }});
         });
     </script>
-{% endspaceless %}
 {% endblock genemu_jqueryrating_javascript %}
 
 {% block genemu_jquerytokeninput_javascript %}
-{% spaceless %}
     <script type="text/javascript">
         jQuery(document).ready(function($) {
             var $field = $('#{{ id }}');
@@ -239,11 +222,9 @@
             );
         });
     </script>
-{% endspaceless %}
 {% endblock genemu_jquerytokeninput_javascript %}
 
 {% block genemu_jqueryautocompleter_javascript %}
-{% spaceless %}
     <script type="text/javascript">
         jQuery(document).ready(function($) {
             var $field = $('#{{ id }}');
@@ -311,11 +292,9 @@
             {% endif %}
         });
     </script>
-{% endspaceless %}
 {% endblock genemu_jqueryautocompleter_javascript %}
 
 {% block genemu_jqueryautocomplete_javascript %}
-{% spaceless %}
     <script type="text/javascript">
         jQuery(document).ready(function($) {
             var $autocompleter = $('#{{ id }}');
@@ -340,11 +319,9 @@
             {% endif %}
         });
     </script>
-{% endspaceless %}
 {% endblock %}
 
 {% block genemu_jquerychosen_javascript %}
-{% spaceless %}
     <script type="text/javascript">
         jQuery(document).ready(function($) {
             $field = $('#{{ id }}');
@@ -358,11 +335,9 @@
             {% endblock %}
         });
     </script>
-{% endspaceless %}
 {% endblock %}
 
 {% block genemu_jquerygeolocation_javascript %}
-{% spaceless %}
     {# Elements generation #}
     {% if map is same as(true) %}
         {% set elements = elements|merge({"map": "#" ~ id ~ "_map"}) %}
@@ -403,11 +378,9 @@
             {% endif %}
         });
     </script>
-{% endspaceless %}
 {% endblock genemu_jquerygeolocation_javascript %}
 
 {% block genemu_jqueryfile_javascript %}
-{% spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         var $field = $('#{{ id }}_upload');
@@ -481,11 +454,9 @@
         {% endblock %}
     });
 </script>
-{% endspaceless %}
 {% endblock %}
 
 {% block genemu_jqueryimage_javascript %}
-{% spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         var $field   = $('#{{ id }}_upload');
@@ -649,7 +620,6 @@
         {% endblock %}
     });
 </script>
-{% endspaceless %}
 {% endblock %}
 
 {% block genemu_jqueryselect2_javascript %}
diff --git a/Resources/views/Form/stylesheet_layout.html.twig b/Resources/views/Form/stylesheet_layout.html.twig
index f2961fff..f56192ff 100644
--- a/Resources/views/Form/stylesheet_layout.html.twig
+++ b/Resources/views/Form/stylesheet_layout.html.twig
@@ -1,9 +1,7 @@
 {% block form_stylesheet %}
-{% spaceless %}
     {% for child in form %}
         {{ form_stylesheet(child) }}
     {% endfor %}
-{% endspaceless %}
 {% endblock form_stylesheet %}
 
 {% block field_stylesheet "" %}
@@ -11,7 +9,6 @@
 {% block button_stylesheet "" %}
 
 {% block genemu_jquerycolor_stylesheet %}
-{% spaceless %}
 {% if widget == "image" %}
     <style type="text/css" media="screen">
         #{{ id }}_color {
@@ -32,22 +29,18 @@
         }
     </style>
 {% endif %}
-{% endspaceless %}
 {% endblock genemu_jquerycolor_stylesheet %}
 
 {% block genemu_jquerygeolocation_stylesheet %}
-{% spaceless %}
     <style type="text/css" media="screen">
         #{{ id }}_map {
             width: 300px;
             height: 300px;
         }
     </style>
-{% endspaceless %}
 {% endblock genemu_jquerygeolocation_stylesheet %}
 
 {% block genemu_jqueryimage_stylesheet %}
-{% spaceless %}
     <style type="text/css" media="screen">
         #{{ id }}_container {
             overflow: hidden;
@@ -130,5 +123,4 @@
             height: 11px;
         }
     </style>
-{% endspaceless %}
 {% endblock genemu_jqueryimage_stylesheet %}

From e7bb296d09d3397ad11eb3bc7a8aec736d59268e Mon Sep 17 00:00:00 2001
From: Ravindra Khokharia <ravindrakhokharia@gmail.com>
Date: Fri, 10 Jan 2020 11:56:58 +0530
Subject: [PATCH 08/12] Update base64.xml

Update Controller class string
---
 Resources/config/routing/base64.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/config/routing/base64.xml b/Resources/config/routing/base64.xml
index 9ed1c1f6..302919ff 100644
--- a/Resources/config/routing/base64.xml
+++ b/Resources/config/routing/base64.xml
@@ -5,11 +5,11 @@
     xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
 
     <route id="genemu_captcha_refresh" path="/genemu-captcha-refresh">
-        <default key="_controller">GenemuFormBundle:Base64:refreshCaptcha</default>
+        <default key="_controller">Genemu\Bundle\FormBundle\Controller\Base64Controller:refreshCaptchaAction</default>
     </route>
 
     <route id="genemu_base64" path="/genemu_base64">
-        <default key="_controller">GenemuFormBundle:Base64:base64</default>
+        <default key="_controller">Genemu\Bundle\FormBundle\Controller\Base64Controller:base64Action</default>
     </route>
 
-</routes>
\ No newline at end of file
+</routes>

From 4631ee248f0920ee7767c71ae036c012742817b4 Mon Sep 17 00:00:00 2001
From: Ravindra Khokharia <ravindrakhokharia@gmail.com>
Date: Fri, 10 Jan 2020 11:57:35 +0530
Subject: [PATCH 09/12] Update image.xml

Update controller class string
---
 Resources/config/routing/image.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/config/routing/image.xml b/Resources/config/routing/image.xml
index feab4565..a74a3969 100644
--- a/Resources/config/routing/image.xml
+++ b/Resources/config/routing/image.xml
@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
 
     <route id="genemu_form_image" path="/genemu_change_image">
-        <default key="_controller">GenemuFormBundle:Image:change</default>
+        <default key="_controller">Genemu\Bundle\FormBundle\Controller\ImageController:changeAction</default>
     </route>
 
-</routes>
\ No newline at end of file
+</routes>

From 7a0e1d6406d2c4750438cce6efc45afca9814479 Mon Sep 17 00:00:00 2001
From: Ravindra Khokharia <ravindrakhokharia@gmail.com>
Date: Fri, 10 Jan 2020 11:58:00 +0530
Subject: [PATCH 10/12] Update upload.xml

Update controller class string
---
 Resources/config/routing/upload.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/config/routing/upload.xml b/Resources/config/routing/upload.xml
index 36828fab..cceeec96 100644
--- a/Resources/config/routing/upload.xml
+++ b/Resources/config/routing/upload.xml
@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
 
     <route id="genemu_upload" path="/genemu_upload">
-        <default key="_controller">GenemuFormBundle:Upload:upload</default>
+        <default key="_controller">Genemu\Bundle\FormBundle\Controller\UploadController:uploadAction</default>
     </route>
 
-</routes>
\ No newline at end of file
+</routes>

From a8ee9411e8112698e9c5f276fc134b994c1d174e Mon Sep 17 00:00:00 2001
From: kuldippujara <kuldippujara@gmail.com>
Date: Thu, 10 Mar 2022 11:24:38 +0530
Subject: [PATCH 11/12] fixed package name

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ad5e7e6a..096bac07 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "prolix/form-bundle",
+    "name": "genemu/form-bundle",
     "type": "symfony-bundle",
     "description": "Extra form types for your Symfony2 projects",
     "keywords": ["form", "extra form"],

From 7d54a80f0c6c8db8d107d38906f119105042caea Mon Sep 17 00:00:00 2001
From: kuldippujara <kuldippujara@gmail.com>
Date: Tue, 13 Sep 2022 17:21:40 +0530
Subject: [PATCH 12/12] sf6 compatibility

---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 096bac07..b004a7bf 100644
--- a/composer.json
+++ b/composer.json
@@ -20,9 +20,9 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/framework-bundle": "~3.4|~4.0||~5.0",
-        "symfony/form": "~3.4|~4.0|~5.0",
-        "twig/twig": "3.0.*"
+        "symfony/framework-bundle": "~3.4|~4.0|~5.0|^6.0",
+        "symfony/form": "~3.4|~4.0|~5.0|^6.0",
+        "twig/twig": "3.4.*"
     },
     "suggest": {
         "symfony/twig-bridge": "For integration into Twig templates",