From 829ac8c20c491b65fc5b81b47a9eab128385c2b8 Mon Sep 17 00:00:00 2001
From: Jordi <jordism91@gmail.com>
Date: Wed, 29 Jul 2020 09:47:12 +0200
Subject: [PATCH] Upgrade to Symfony 5.0 and Twig 3

---
 composer.json                        | 18 +++++++---------
 phpstan-baseline.neon                |  6 ++++++
 phpstan.neon.dist                    |  6 +++---
 src/Templating/Helper/BaseHelper.php | 31 ++++++++++++++++++++++++----
 4 files changed, 44 insertions(+), 17 deletions(-)
 create mode 100644 phpstan-baseline.neon

diff --git a/composer.json b/composer.json
index 8f091901..ad0701bb 100644
--- a/composer.json
+++ b/composer.json
@@ -22,23 +22,21 @@
         }
     ],
     "require": {
-        "php": "^7.1",
-        "symfony/config": "^4.4",
-        "symfony/dependency-injection": "^4.4",
-        "symfony/http-foundation": "^4.4",
-        "symfony/http-kernel": "^4.4",
+        "php": "^7.2",
+        "symfony/config": "^4.4 || ^5.0",
+        "symfony/dependency-injection": "^4.4 || ^5.0",
+        "symfony/http-foundation": "^4.4 || ^5.0",
+        "symfony/http-kernel": "^4.4 || ^5.0",
         "symfony/intl": "^4.4 || ^5.0",
-        "symfony/templating": "^4.4",
-        "twig/twig": "^2.9"
+        "twig/twig": "^2.9 || ^3.0"
     },
     "conflict": {
-        "sonata-project/user-bundle": "<2.0 || >=5.0"
+        "sonata-project/user-bundle": "<3.6"
     },
     "require-dev": {
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",
-        "sonata-project/user-bundle": "^3.6 || ^4.0",
         "symfony/phpunit-bridge": "^5.1",
-        "symfony/security-core": "^4.4"
+        "symfony/security-core": "^4.4 || ^5.0"
     },
     "config": {
         "sort-packages": true
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
new file mode 100644
index 00000000..c7895e8e
--- /dev/null
+++ b/phpstan-baseline.neon
@@ -0,0 +1,6 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Class Sonata\\\\UserBundle\\\\Model\\\\User not found\\.$#"
+			count: 2
+			path: src/Timezone/UserBasedTimezoneDetector.php
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index a19e9a59..488316a7 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -1,3 +1,6 @@
+includes:
+    - phpstan-baseline.neon
+
 parameters:
     level: 1
 
@@ -9,6 +12,3 @@ parameters:
     excludes_analyse:
         - src/Test/AbstractWidgetTestCase.php
         - tests/bootstrap.php
-
-    autoload_files:
-        - vendor/autoload.php
diff --git a/src/Templating/Helper/BaseHelper.php b/src/Templating/Helper/BaseHelper.php
index 20dcce52..f380f57f 100644
--- a/src/Templating/Helper/BaseHelper.php
+++ b/src/Templating/Helper/BaseHelper.php
@@ -14,7 +14,6 @@
 namespace Sonata\IntlBundle\Templating\Helper;
 
 use Sonata\IntlBundle\Locale\LocaleDetectorInterface;
-use Symfony\Component\Templating\Helper\Helper;
 
 /**
  * BaseHelper provides charset conversion.
@@ -28,8 +27,13 @@
  *
  * @author Alexander <iam.asm89@gmail.com>
  */
-abstract class BaseHelper extends Helper
+abstract class BaseHelper
 {
+    /**
+     * @var string
+     */
+    protected $charset = 'UTF-8';
+
     /**
      * @var LocaleDetectorInterface
      */
@@ -40,11 +44,30 @@ abstract class BaseHelper extends Helper
      */
     public function __construct($charset, LocaleDetectorInterface $localeDetector)
     {
-        $this->setCharset($charset);
-
+        $this->charset = $charset;
         $this->localeDetector = $localeDetector;
     }
 
+    /**
+     * Sets the default charset.
+     *
+     * @param string $charset The charset
+     */
+    public function setCharset($charset)
+    {
+        $this->charset = $charset;
+    }
+
+    /**
+     * Gets the default charset.
+     *
+     * @return string The default charset
+     */
+    public function getCharset()
+    {
+        return $this->charset;
+    }
+
     /**
      * Typo in the method name.
      *