From 7a54d8b36df287a955b70ab14236eea51f4d5526 Mon Sep 17 00:00:00 2001
From: Ian Thomas <ian@ithomas.name>
Date: Sat, 9 May 2020 21:42:41 +0100
Subject: [PATCH 01/14] Update getConfigTreeBuilder for forward-compatibility
 #123

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

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 52ef5e4a..379ba0cc 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -17,8 +17,10 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('comur_image');
+        $treeBuilder = new TreeBuilder('comur_image');
+        $rootNode = method_exists($treeBuilder, "getRootNode")
+            ? $treeBuilder->getRootNode()
+            : $treeBuilder->root('comur_image'); // BC layer for symfony/config 4.2 and older
 
         $rootNode
             ->children()

From 9563cd0edebc83d1b367b7d466e516b097bab13e Mon Sep 17 00:00:00 2001
From: Ian Thomas <ian@ithomas.name>
Date: Sun, 10 May 2020 13:21:15 +0100
Subject: [PATCH 02/14] Replace deprecated spaceless tag with apply

Minimum twig version increased to match Symfony 3.4 and ensure the apply tag is available
---
 Resources/views/Form/fields.html.twig | 8 ++++----
 composer.json                         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Resources/views/Form/fields.html.twig b/Resources/views/Form/fields.html.twig
index 140c84f9..a14ca437 100644
--- a/Resources/views/Form/fields.html.twig
+++ b/Resources/views/Form/fields.html.twig
@@ -1,7 +1,7 @@
 {% block comur_image_widget %}
     {% trans_default_domain comur_translation_domain %}
     {# trans_default_domain 'ComurImageBundle' #}
-    {% spaceless %}
+    {% apply spaceless %}
         {# block('form_widget_simple') #}
         {{ form_widget(form[name])}}
         {% if options.uploadConfig.saveOriginal %}
@@ -35,7 +35,7 @@
 
             </div>
         </div>
-    {% endspaceless %}
+    {% endapply %}
 
     <script>
         $(document).ready(function(){
@@ -80,7 +80,7 @@
     {% trans_default_domain comur_translation_domain %}
     {# trans_default_domain 'ComurImageBundle' #}
 
-    {% spaceless %}
+    {% apply spaceless %}
         {{- form_errors(form) -}}
         <div class="field-error clearfix hidden">
             <div id="{{form[name].vars.id}}_widget_error" class="alert alert-danger span6">
@@ -108,7 +108,7 @@
         </div>
 
 
-    {% endspaceless %}
+    {% endapply %}
 
     <script>
 
diff --git a/composer.json b/composer.json
index 7b84885b..5b283bdd 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "symfony/routing": "~3.4 || ~4.2",
         "symfony/config": "~3.4 || ~4.2",
         "symfony/twig-bridge": "~3.4 || ~4.2",
-        "twig/twig": "~1.35 || ~2.5",
+        "twig/twig": "^1.41 || ^2.10",
         "twig/extensions": "~1.0",
         "friendsofsymfony/jsrouting-bundle": "@stable",
 	    "jms/translation-bundle": "^1.2.2"

From d0aa4200a606211136056800113ca07ccdb16aa2 Mon Sep 17 00:00:00 2001
From: Ian Thomas <ian@ithomas.name>
Date: Sun, 10 May 2020 13:31:56 +0100
Subject: [PATCH 03/14] Use namespaced version of
 Twig_Extension_GlobalsInterface #123

The old version has been deprecated
---
 Twig/ThumbExtension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Twig/ThumbExtension.php b/Twig/ThumbExtension.php
index c12182f7..e0c2ebdb 100644
--- a/Twig/ThumbExtension.php
+++ b/Twig/ThumbExtension.php
@@ -1,7 +1,7 @@
 <?php
 namespace Comur\ImageBundle\Twig;
 
-class ThumbExtension extends \Twig_Extension implements \Twig_Extension_GlobalsInterface
+class ThumbExtension extends \Twig_Extension implements \Twig\Extension\GlobalsInterface
 {
     protected $croppedDir;
     protected $thumbsDir;

From c54a82a4e81e132fcf9385a602b3748fcac24cd7 Mon Sep 17 00:00:00 2001
From: Ian Thomas <ian@ithomas.name>
Date: Sun, 10 May 2020 13:48:48 +0100
Subject: [PATCH 04/14] Update controller action reference syntax #123

See https://symfony.com/blog/new-in-symfony-4-1-deprecated-the-bundle-notation
---
 Resources/config/routing.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml
index 769e7708..366ad1fd 100644
--- a/Resources/config/routing.yml
+++ b/Resources/config/routing.yml
@@ -1,17 +1,17 @@
 comur_api_upload:
     path: /upload #/{paramName}/{uploadUrl}/{webDir}/{minWidth}/{minHeight}
-    defaults: {_controller: "ComurImageBundle:Upload:uploadImage"}
+    defaults: {_controller: \Comur\ImageBundle\Controller\UploadController::uploadImageAction }
     options:
         expose: true
 
 comur_api_crop:
     path: /crop #/{uploadUrl}/{webDir}/{imageName}/{x}/{y}/{w}/{h}/{tarW}/{tarH}
-    defaults: {_controller: "ComurImageBundle:Upload:cropImage"}
+    defaults: {_controller: \Comur\ImageBundle\Controller\UploadController::cropImageAction }
     options:
         expose: true
 
 comur_api_image_library:
     path: /image-library
-    defaults: {_controller: "ComurImageBundle:Upload:getLibraryImages"}
+    defaults: {_controller: \Comur\ImageBundle\Controller\UploadController::getLibraryImagesAction }
     options:
         expose: true

From 860a5f4160ecd33c512fcdccb9d2bb4e65c43127 Mon Sep 17 00:00:00 2001
From: Ian Thomas <ian@ithomas.name>
Date: Sun, 10 May 2020 14:22:33 +0100
Subject: [PATCH 05/14] Stop inheriting from deprecated Controller class #123

See https://symfony.com/blog/new-in-symfony-4-2-important-deprecations#deprecated-the-base-controller-class
---
 Controller/UploadController.php | 43 +++++++++++++++++----------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/Controller/UploadController.php b/Controller/UploadController.php
index 0c5f880a..63256160 100644
--- a/Controller/UploadController.php
+++ b/Controller/UploadController.php
@@ -2,25 +2,26 @@
 
 namespace Comur\ImageBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\Translation\Translator;
 
 use Symfony\Component\Finder\Finder;
 
 use Comur\ImageBundle\Handler\UploadHandler;
 
-class UploadController extends Controller
+class UploadController extends AbstractController
 {
     /**
      * Save uploaded image according to comur_image field configuration
      *
      * @param Request $request
      */
-    public function uploadImageAction(Request $request
+    public function uploadImageAction(Request $request, Translator $translator
         /*, $uploadUrl, $paramName, $webDir, $minWidth=1, $minHeight=1*/
     ){
         $config = json_decode($request->request->get('config'),true);
@@ -83,24 +84,24 @@ public function uploadImageAction(Request $request
         $transDomain = $this->container->getParameter('comur_image.translation_domain');
 
         $errorMessages = array(
-            1 => $this->get('translator')->trans('The uploaded file exceeds the upload_max_filesize directive in php.ini', array(), $transDomain),
-            2 => $this->get('translator')->trans('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', array(), $transDomain),
-            3 => $this->get('translator')->trans('The uploaded file was only partially uploaded', array(), $transDomain),
-            4 => $this->get('translator')->trans('No file was uploaded', array(), $transDomain),
-            6 => $this->get('translator')->trans('Missing a temporary folder', array(), $transDomain),
-            7 => $this->get('translator')->trans('Failed to write file to disk', array(), $transDomain),
-            8 => $this->get('translator')->trans('A PHP extension stopped the file upload', array(), $transDomain),
-            'post_max_size' => $this->get('translator')->trans('The uploaded file exceeds the post_max_size directive in php.ini', array(), $transDomain),
-            'max_file_size' => $this->get('translator')->trans('File is too big', array(), $transDomain),
-            'min_file_size' => $this->get('translator')->trans('File is too small', array(), $transDomain),
-            'accept_file_types' => $this->get('translator')->trans('Filetype not allowed', array(), $transDomain),
-            'max_number_of_files' => $this->get('translator')->trans('Maximum number of files exceeded', array(), $transDomain),
-            'max_width' => $this->get('translator')->trans('Image exceeds maximum width', array(), $transDomain),
-            'min_width' => $this->get('translator')->trans('Image requires a minimum width (%min%)', array('%min%' => $config['cropConfig']['minWidth']), $transDomain),
-            'max_height' => $this->get('translator')->trans('Image exceeds maximum height', array(), $transDomain),
-            'min_height' => $this->get('translator')->trans('Image requires a minimum height (%min%)', array('%min%' => $config['cropConfig']['minHeight']), $transDomain),
-            'abort' => $this->get('translator')->trans('File upload aborted', array(), $transDomain),
-            'image_resize' => $this->get('translator')->trans('Failed to resize image', array(), $transDomain),
+            1 => $translator->trans('The uploaded file exceeds the upload_max_filesize directive in php.ini', array(), $transDomain),
+            2 => $translator->trans('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', array(), $transDomain),
+            3 => $translator->trans('The uploaded file was only partially uploaded', array(), $transDomain),
+            4 => $translator->trans('No file was uploaded', array(), $transDomain),
+            6 => $translator->trans('Missing a temporary folder', array(), $transDomain),
+            7 => $translator->trans('Failed to write file to disk', array(), $transDomain),
+            8 => $translator->trans('A PHP extension stopped the file upload', array(), $transDomain),
+            'post_max_size' => $translator->trans('The uploaded file exceeds the post_max_size directive in php.ini', array(), $transDomain),
+            'max_file_size' => $translator->trans('File is too big', array(), $transDomain),
+            'min_file_size' => $translator->trans('File is too small', array(), $transDomain),
+            'accept_file_types' => $translator->trans('Filetype not allowed', array(), $transDomain),
+            'max_number_of_files' => $translator->trans('Maximum number of files exceeded', array(), $transDomain),
+            'max_width' => $translator->trans('Image exceeds maximum width', array(), $transDomain),
+            'min_width' => $translator->trans('Image requires a minimum width (%min%)', array('%min%' => $config['cropConfig']['minWidth']), $transDomain),
+            'max_height' => $translator->trans('Image exceeds maximum height', array(), $transDomain),
+            'min_height' => $translator->trans('Image requires a minimum height (%min%)', array('%min%' => $config['cropConfig']['minHeight']), $transDomain),
+            'abort' => $translator->trans('File upload aborted', array(), $transDomain),
+            'image_resize' => $translator->trans('Failed to resize image', array(), $transDomain),
         );
 
         $response->setCallback(function () use($handlerConfig, $errorMessages) {

From 8d65de9242b3153045613596ab06d8763fcad6df Mon Sep 17 00:00:00 2001
From: Ian Thomas <ian@ithomas.name>
Date: Sun, 10 May 2020 16:17:39 +0100
Subject: [PATCH 06/14] Remove dependency on JMS Translation Bundle #125

---
 CHANGELOG.md  | 6 ++++++
 README.md     | 2 --
 composer.json | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 624fb50f..9ff63684 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## dev-master
+
+- Removed dependency on JMS Translation Bundle. If you have no other need for this bundle it can be removed by running 
+`composer remove jms/translation-bundle` and taking the relevant line out of `config/bundles.php` (or 
+`app/AppKernel.php` for projects that do not use Flex)
+
 ## [2.0.4](https://github.com/comur/ComurImageBundle/tree/2.0.4) (2019-05-31)
 [Full Changelog](https://github.com/comur/ComurImageBundle/compare/2.0.3...2.0.4)
 
diff --git a/README.md b/README.md
index 28d81359..7629c343 100644
--- a/README.md
+++ b/README.md
@@ -111,7 +111,6 @@ return [
             // ...
             Comur\ImageBundle\ComurImageBundle::class => ['all' => true],
             FOS\JsRoutingBundle\FOSJsRoutingBundle::class => ['all' => true],
-            JMS\TranslationBundle\JMSTranslationBundle::class => ['all' => true],
         ];
 ```
 
@@ -165,7 +164,6 @@ class AppKernel extends Kernel
             // ...
             new Comur\ImageBundle\ComurImageBundle(),
             new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
-            new JMS\TranslationBundle\JMSTranslationBundle(),
         ];
 
         // ...
diff --git a/composer.json b/composer.json
index 7b84885b..588d4b80 100644
--- a/composer.json
+++ b/composer.json
@@ -20,11 +20,11 @@
         "symfony/validator": "~3.4 || ~4.2",
         "symfony/routing": "~3.4 || ~4.2",
         "symfony/config": "~3.4 || ~4.2",
+        "symfony/translation": "^3.4 || ~4.2",
         "symfony/twig-bridge": "~3.4 || ~4.2",
         "twig/twig": "~1.35 || ~2.5",
         "twig/extensions": "~1.0",
-        "friendsofsymfony/jsrouting-bundle": "@stable",
-	    "jms/translation-bundle": "^1.2.2"
+        "friendsofsymfony/jsrouting-bundle": "@stable"
     },
     "autoload": {
         "psr-4": {

From 92cdd09da37e89383982f390ba08c7c584c5d22a Mon Sep 17 00:00:00 2001
From: Ian Thomas <ian@ithomas.name>
Date: Sun, 6 Sep 2020 22:19:09 +0100
Subject: [PATCH 07/14] Switch to constructor injection #123

Register the controller as a service with autowiring
---
 Controller/UploadController.php | 50 ++++++++++++++++++---------------
 Resources/config/services.yml   |  5 ++++
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/Controller/UploadController.php b/Controller/UploadController.php
index 63256160..4498b958 100644
--- a/Controller/UploadController.php
+++ b/Controller/UploadController.php
@@ -8,7 +8,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\Translation\Translator;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use Symfony\Component\Finder\Finder;
 
@@ -16,12 +16,19 @@
 
 class UploadController extends AbstractController
 {
+    private $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
     /**
      * Save uploaded image according to comur_image field configuration
      *
      * @param Request $request
      */
-    public function uploadImageAction(Request $request, Translator $translator
+    public function uploadImageAction(Request $request
         /*, $uploadUrl, $paramName, $webDir, $minWidth=1, $minHeight=1*/
     ){
         $config = json_decode($request->request->get('config'),true);
@@ -84,24 +91,24 @@ public function uploadImageAction(Request $request, Translator $translator
         $transDomain = $this->container->getParameter('comur_image.translation_domain');
 
         $errorMessages = array(
-            1 => $translator->trans('The uploaded file exceeds the upload_max_filesize directive in php.ini', array(), $transDomain),
-            2 => $translator->trans('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', array(), $transDomain),
-            3 => $translator->trans('The uploaded file was only partially uploaded', array(), $transDomain),
-            4 => $translator->trans('No file was uploaded', array(), $transDomain),
-            6 => $translator->trans('Missing a temporary folder', array(), $transDomain),
-            7 => $translator->trans('Failed to write file to disk', array(), $transDomain),
-            8 => $translator->trans('A PHP extension stopped the file upload', array(), $transDomain),
-            'post_max_size' => $translator->trans('The uploaded file exceeds the post_max_size directive in php.ini', array(), $transDomain),
-            'max_file_size' => $translator->trans('File is too big', array(), $transDomain),
-            'min_file_size' => $translator->trans('File is too small', array(), $transDomain),
-            'accept_file_types' => $translator->trans('Filetype not allowed', array(), $transDomain),
-            'max_number_of_files' => $translator->trans('Maximum number of files exceeded', array(), $transDomain),
-            'max_width' => $translator->trans('Image exceeds maximum width', array(), $transDomain),
-            'min_width' => $translator->trans('Image requires a minimum width (%min%)', array('%min%' => $config['cropConfig']['minWidth']), $transDomain),
-            'max_height' => $translator->trans('Image exceeds maximum height', array(), $transDomain),
-            'min_height' => $translator->trans('Image requires a minimum height (%min%)', array('%min%' => $config['cropConfig']['minHeight']), $transDomain),
-            'abort' => $translator->trans('File upload aborted', array(), $transDomain),
-            'image_resize' => $translator->trans('Failed to resize image', array(), $transDomain),
+            1 => $this->translator->trans('The uploaded file exceeds the upload_max_filesize directive in php.ini', array(), $transDomain),
+            2 => $this->translator->trans('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', array(), $transDomain),
+            3 => $this->translator->trans('The uploaded file was only partially uploaded', array(), $transDomain),
+            4 => $this->translator->trans('No file was uploaded', array(), $transDomain),
+            6 => $this->translator->trans('Missing a temporary folder', array(), $transDomain),
+            7 => $this->translator->trans('Failed to write file to disk', array(), $transDomain),
+            8 => $this->translator->trans('A PHP extension stopped the file upload', array(), $transDomain),
+            'post_max_size' => $this->translator->trans('The uploaded file exceeds the post_max_size directive in php.ini', array(), $transDomain),
+            'max_file_size' => $this->translator->trans('File is too big', array(), $transDomain),
+            'min_file_size' => $this->translator->trans('File is too small', array(), $transDomain),
+            'accept_file_types' => $this->translator->trans('Filetype not allowed', array(), $transDomain),
+            'max_number_of_files' => $this->translator->trans('Maximum number of files exceeded', array(), $transDomain),
+            'max_width' => $this->translator->trans('Image exceeds maximum width', array(), $transDomain),
+            'min_width' => $this->translator->trans('Image requires a minimum width (%min%)', array('%min%' => $config['cropConfig']['minWidth']), $transDomain),
+            'max_height' => $this->translator->trans('Image exceeds maximum height', array(), $transDomain),
+            'min_height' => $this->translator->trans('Image requires a minimum height (%min%)', array('%min%' => $config['cropConfig']['minHeight']), $transDomain),
+            'abort' => $this->translator->trans('File upload aborted', array(), $transDomain),
+            'image_resize' => $this->translator->trans('Failed to resize image', array(), $transDomain),
         );
 
         $response->setCallback(function () use($handlerConfig, $errorMessages) {
@@ -431,8 +438,7 @@ private function resizeCropImage($destSrc, $imgSrc, $destX, $destY, $srcX, $srcY
      */
     public function getTranslationCatalogue(Request $request) {
         $transDomain = $this->container->getParameter('comur_image.translation_domain');
-        $translator = $this->container->get('translator');
-        $catalogue = $translator->getCatalogue($request->getLocale());
+        $catalogue = $this->translator->getCatalogue($request->getLocale());
         $messages = $catalogue->all();
 
         return $this->render('@ComurImage/translations.html.twig', array(
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index 07716a06..c3098801 100644
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -17,3 +17,8 @@ services:
         tags:
             - { name: twig.extension }
         arguments: ["%comur_image.cropped_image_dir%", "%comur_image.thumbs_dir%", "%comur_image.public_dir%", "%comur_image.translation_domain%", "%comur_image.gallery_dir%"]
+
+    Comur\ImageBundle\Controller\:
+        autowire: true
+        resource: '../../Controller'
+        tags: ['controller.service_arguments']

From e7592f6affcfcfb20f148ffc13c866b053113bf3 Mon Sep 17 00:00:00 2001
From: Ian Thomas <ian@ithomas.name>
Date: Sun, 10 Jan 2021 14:49:32 +0000
Subject: [PATCH 08/14] Declare support for Symfony 5 and Twig 3 #123

---
 composer.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 5b283bdd..be6349ee 100644
--- a/composer.json
+++ b/composer.json
@@ -15,13 +15,13 @@
     "require": {
         "php": ">=7.1.3",
         "ext-gd": "*",
-        "symfony/http-foundation": "~3.4 || ~4.2",
-        "symfony/form": "~3.4 || ~4.2",
-        "symfony/validator": "~3.4 || ~4.2",
-        "symfony/routing": "~3.4 || ~4.2",
-        "symfony/config": "~3.4 || ~4.2",
-        "symfony/twig-bridge": "~3.4 || ~4.2",
-        "twig/twig": "^1.41 || ^2.10",
+        "symfony/http-foundation": "~3.4 || ~4.2 || ~5.0",
+        "symfony/form": "~3.4 || ~4.2 || ~5.0",
+        "symfony/validator": "~3.4 || ~4.2 || ~5.0",
+        "symfony/routing": "~3.4 || ~4.2 || ~5.0",
+        "symfony/config": "~3.4 || ~4.2 || ~5.0",
+        "symfony/twig-bridge": "~3.4 || ~4.2 || ~5.0",
+        "twig/twig": "^1.41 || ^2.10 || ~3.0",
         "twig/extensions": "~1.0",
         "friendsofsymfony/jsrouting-bundle": "@stable",
 	    "jms/translation-bundle": "^1.2.2"

From b335b010439d94e2a620d69059a46fef2ba254eb Mon Sep 17 00:00:00 2001
From: Ian Thomas <ian@ithomas.name>
Date: Mon, 8 Mar 2021 14:41:09 +0000
Subject: [PATCH 09/14] Replace deprecated TranslatorInterface (depends on
 Symfony 4.2) #123

As documented in UPGRADE-4.2.md.
Minimum Symfony version raised from 3.4 to 4.2.
Explict dependency added for symfony/translation.
---
 Controller/UploadController.php |  2 +-
 composer.json                   | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Controller/UploadController.php b/Controller/UploadController.php
index 4498b958..16c5ad66 100644
--- a/Controller/UploadController.php
+++ b/Controller/UploadController.php
@@ -8,7 +8,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use Symfony\Component\Finder\Finder;
 
diff --git a/composer.json b/composer.json
index be6349ee..e0d8dd2a 100644
--- a/composer.json
+++ b/composer.json
@@ -15,12 +15,13 @@
     "require": {
         "php": ">=7.1.3",
         "ext-gd": "*",
-        "symfony/http-foundation": "~3.4 || ~4.2 || ~5.0",
-        "symfony/form": "~3.4 || ~4.2 || ~5.0",
-        "symfony/validator": "~3.4 || ~4.2 || ~5.0",
-        "symfony/routing": "~3.4 || ~4.2 || ~5.0",
-        "symfony/config": "~3.4 || ~4.2 || ~5.0",
-        "symfony/twig-bridge": "~3.4 || ~4.2 || ~5.0",
+        "symfony/http-foundation": "~4.2 || ~5.0",
+        "symfony/form": "~4.2 || ~5.0",
+        "symfony/validator": "~4.2 || ~5.0",
+        "symfony/routing": "~4.2 || ~5.0",
+        "symfony/config": "~4.2 || ~5.0",
+        "symfony/translation": "~4.2 || ~5.0",
+        "symfony/twig-bridge": "~4.2 || ~5.0",
         "twig/twig": "^1.41 || ^2.10 || ~3.0",
         "twig/extensions": "~1.0",
         "friendsofsymfony/jsrouting-bundle": "@stable",

From cdf800bdaf819b70a2c384a6105dcc7a0abbbbb8 Mon Sep 17 00:00:00 2001
From: Ian Thomas <ian@ithomas.name>
Date: Mon, 8 Mar 2021 16:10:42 +0000
Subject: [PATCH 10/14] Use GlobalsInterface instead of getGlobals #123

Interface was introduced on twig 1.23. Required for twig 2/3.
---
 Twig/ThumbExtension.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Twig/ThumbExtension.php b/Twig/ThumbExtension.php
index 37c400e9..6fba4e3c 100644
--- a/Twig/ThumbExtension.php
+++ b/Twig/ThumbExtension.php
@@ -2,9 +2,10 @@
 namespace Comur\ImageBundle\Twig;
 
 use Twig\Extension\AbstractExtension;
+use Twig\Extension\GlobalsInterface;
 use Twig\TwigFilter;
 
-class ThumbExtension extends AbstractExtension
+class ThumbExtension extends AbstractExtension implements GlobalsInterface
 {
     protected $croppedDir;
     protected $thumbsDir;
@@ -65,7 +66,7 @@ public function getName()
         return 'comur_thumb_extension';
     }
 
-    public function getGlobals()
+    public function getGlobals(): array
     {
         return array('comur_translation_domain' => $this->transDomain);
     }

From 8fd00c80d7d02979dba24db68c5290b66289f68d Mon Sep 17 00:00:00 2001
From: Ian Thomas <ian@ithomas.name>
Date: Sun, 13 Nov 2022 21:58:02 +0000
Subject: [PATCH 11/14] Controllers should return a Response object

This was causing an exception under my Symfony 5.4 project with session headers being changed after the response had been sent.
---
 Controller/UploadController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Controller/UploadController.php b/Controller/UploadController.php
index 16c5ad66..865e1882 100644
--- a/Controller/UploadController.php
+++ b/Controller/UploadController.php
@@ -115,7 +115,7 @@ public function uploadImageAction(Request $request
             new UploadHandler($handlerConfig, true, $errorMessages);
         });
 
-        return $response->send();
+        return $response;
     }
 
     /**

From 472d70d62587ad2928a056d3c4f1ef7a8f134945 Mon Sep 17 00:00:00 2001
From: Ian Tommins <ian@tommins.uk>
Date: Mon, 7 Oct 2024 23:02:47 +0100
Subject: [PATCH 12/14] Declare symfony 6 support

---
 composer.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 8b301a7b..28b2930d 100644
--- a/composer.json
+++ b/composer.json
@@ -15,13 +15,13 @@
     "require": {
         "php": ">=7.1.3",
         "ext-gd": "*",
-        "symfony/http-foundation": "~4.2 || ~5.0",
-        "symfony/form": "~4.2 || ~5.0",
-        "symfony/validator": "~4.2 || ~5.0",
-        "symfony/routing": "~4.2 || ~5.0",
-        "symfony/config": "~4.2 || ~5.0",
-        "symfony/translation": "~4.2 || ~5.0",
-        "symfony/twig-bridge": "~4.2 || ~5.0",
+        "symfony/http-foundation": "~4.2 || ~5.0 || ~6.0",
+        "symfony/form": "~4.2 || ~5.0 || ~6.0",
+        "symfony/validator": "~4.2 || ~5.0 || ~6.0",
+        "symfony/routing": "~4.2 || ~5.0 || ~6.0",
+        "symfony/config": "~4.2 || ~5.0 || ~6.0",
+        "symfony/translation": "~4.2 || ~5.0 || ~6.0",
+        "symfony/twig-bridge": "~4.2 || ~5.0 || ~6.0",
         "twig/twig": "^1.41 || ^2.10 || ~3.0",
         "twig/extra-bundle": "@stable",
         "friendsofsymfony/jsrouting-bundle": "@stable",

From f7d2f6a33349379ef69b5316b49824f08c89197f Mon Sep 17 00:00:00 2001
From: Ian Tommins <ian@tommins.uk>
Date: Mon, 7 Oct 2024 23:05:21 +0100
Subject: [PATCH 13/14] Allow jms/translation-bundle 2.0

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

diff --git a/composer.json b/composer.json
index 28b2930d..1f0a3f0e 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
         "twig/twig": "^1.41 || ^2.10 || ~3.0",
         "twig/extra-bundle": "@stable",
         "friendsofsymfony/jsrouting-bundle": "@stable",
-	    "jms/translation-bundle": "^1.2.2"
+	    "jms/translation-bundle": "^1.2.2 || ^2.0"
     },
     "autoload": {
         "psr-4": {

From 57bb75c600fba5b0d25f7830c23b831971300c53 Mon Sep 17 00:00:00 2001
From: Ian Tommins <ian@tommins.uk>
Date: Sun, 13 Oct 2024 22:01:04 +0100
Subject: [PATCH 14/14] Update composer.json

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

diff --git a/composer.json b/composer.json
index 89bcd490..1c602cbb 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "symfony/twig-bridge": "~4.2 || ~5.0 || ~6.0",
         "twig/twig": "^1.41 || ^2.10 || ~3.0",
         "twig/extra-bundle": "@stable",
-        "friendsofsymfony/jsrouting-bundle": "@stable",
+        "friendsofsymfony/jsrouting-bundle": "@stable"
     },
     "autoload": {
         "psr-4": {