From 585a4d0332561a15d8f6cce2b22f0a10c8b1ce0e Mon Sep 17 00:00:00 2001
From: Pavel Dohnal <pavel@mailpoet.com>
Date: Thu, 13 Aug 2020 13:41:38 +0200
Subject: [PATCH] Fix normalizer not being prefixed correctly

[MAILPOET-3105]
---
 composer.json                     |  1 +
 prefixer/composer.json            |  4 +++-
 prefixer/composer.lock            |  5 +++--
 prefixer/fix-symfony-polyfill.php | 11 +++++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 prefixer/fix-symfony-polyfill.php

diff --git a/composer.json b/composer.json
index 47b6e48d7e..f87c6dbeb9 100644
--- a/composer.json
+++ b/composer.json
@@ -54,6 +54,7 @@
       "vendor-prefixed/symfony/polyfill-mbstring/bootstrap.php",
       "vendor-prefixed/symfony/polyfill-php72/bootstrap.php",
       "vendor-prefixed/symfony/polyfill-intl-idn/bootstrap.php",
+      "vendor-prefixed/symfony/polyfill-intl-normalizer/bootstrap.php",
       "vendor-prefixed/swiftmailer/swiftmailer/lib/swift_required.php"
     ],
     "psr-4": {
diff --git a/prefixer/composer.json b/prefixer/composer.json
index 9b2d48234c..20ae2c4e5a 100644
--- a/prefixer/composer.json
+++ b/prefixer/composer.json
@@ -15,6 +15,7 @@
     "symfony/polyfill-iconv": "1.18.1",
     "symfony/polyfill-intl-idn": "1.18.1",
     "symfony/polyfill-mbstring": "1.18.1",
+    "symfony/polyfill-intl-normalizer": "1.18.1",
     "symfony/polyfill-php72": "1.18.1",
     "symfony/validator": "3.4.43",
     "twig/twig": "2.12.5"
@@ -31,7 +32,8 @@
       "php fix-doctrine.php",
       "php fix-swiftmailer.php",
       "php fix-validator.php",
-      "php fix-monolog.php"
+      "php fix-monolog.php",
+      "php fix-symfony-polyfill.php"
     ]
   },
   "config": {
diff --git a/prefixer/composer.lock b/prefixer/composer.lock
index 9db65c7e45..4189ea568c 100644
--- a/prefixer/composer.lock
+++ b/prefixer/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f3b48338d317059f392130193f33cf18",
+    "content-hash": "ec6d7695defed3098c8785070f8daeef",
     "packages": [
         {
             "name": "cerdic/css-tidy",
@@ -2129,5 +2129,6 @@
     "platform-dev": [],
     "platform-overrides": {
         "php": "7.0.33"
-    }
+    },
+    "plugin-api-version": "1.1.0"
 }
diff --git a/prefixer/fix-symfony-polyfill.php b/prefixer/fix-symfony-polyfill.php
new file mode 100644
index 0000000000..e568539a5e
--- /dev/null
+++ b/prefixer/fix-symfony-polyfill.php
@@ -0,0 +1,11 @@
+<?php
+
+// throw exception if anything fails
+set_error_handler(function ($severity, $message, $file, $line) {
+  throw new ErrorException($message, 0, $severity, $file, $line);
+});
+
+$file = __DIR__ . '/../vendor-prefixed/symfony/polyfill-intl-idn/Idn.php';
+$data = file_get_contents($file);
+$data = str_replace('use Normalizer;', 'use MailPoetVendor\\Normalizer;', $data);
+file_put_contents($file, $data);